January 2021 - Wine-Devel - list.winehq.org

[PATCH 2/4] gdiplus: Correctly handle UnitDisplay for printer DC.
by Ziqing Hui Jan. 17, 2021

Jan. 17, 2021

For printer DC, UnitDisplay specifies that a unit is 1/100 inch, which is different from display DC. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=17848 Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/gdiplus/font.c | 12 +++++------ dlls/gdiplus/gdiplus.c | 22 +++++++++++++------- dlls/gdiplus/gdiplus_private.h | 8 ++++--- dlls/gdiplus/graphics.c | 38 ++++++++++++++++++---------------- dlls/gdiplus/image.c | 12 +++++++---- dlls/gdiplus/metafile.c | 23 ++++++++++++-------- dlls/gdiplus/tests/graphics.c | 2 -- 7 files changed, 68 insertions(+), 49 deletions(-)

2 1

[PATCH] ntdll/tests: Add tests for semaphore.
by Daniel Lehman Jan. 16, 2021

Jan. 16, 2021

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/ntdll/tests/om.c | 79 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index c92b780541f..1bc94f984b5 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -46,6 +46,7 @@ static NTSTATUS (WINAPI *pNtQueryMutant) ( HANDLE, MUTANT_INFORMATION_CLASS, PVO static NTSTATUS (WINAPI *pNtReleaseMutant)( HANDLE, PLONG ); static NTSTATUS (WINAPI *pNtCreateSemaphore)( PHANDLE, ACCESS_MASK,const POBJECT_ATTRIBUTES,LONG,LONG ); static NTSTATUS (WINAPI *pNtOpenSemaphore)( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES ); +static NTSTATUS (WINAPI *pNtQuerySemaphore)( PHANDLE, SEMAPHORE_INFORMATION_CLASS, PVOID, ULONG, PULONG ); static NTSTATUS (WINAPI *pNtCreateTimer) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, TIMER_TYPE ); static NTSTATUS (WINAPI *pNtOpenTimer)( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES ); static NTSTATUS (WINAPI *pNtCreateSection)( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, const PLARGE_INTEGER, @@ -2024,6 +2025,82 @@ static void test_mutant(void) NtClose( mutant ); } +static void test_semaphore(void) +{ + SEMAPHORE_BASIC_INFORMATION info; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + NTSTATUS status; + HANDLE semaphore; + ULONG prev; + ULONG len; + DWORD ret; + + pRtlInitUnicodeString(&str, L"\\BaseNamedObjects\\test_semaphore"); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + + status = pNtCreateSemaphore(&semaphore, GENERIC_ALL, &attr, 2, 1); + ok( status == STATUS_INVALID_PARAMETER, "Failed to create Semaphore(%08x)\n", status ); + status = pNtCreateSemaphore(&semaphore, GENERIC_ALL, &attr, 1, 2); + ok( status == STATUS_SUCCESS, "Failed to create Semaphore(%08x)\n", status ); + + /* bogus */ + status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, 0, NULL); + ok( status == STATUS_INFO_LENGTH_MISMATCH, + "Failed to NtQuerySemaphore, expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + status = pNtQuerySemaphore(semaphore, 0x42, &info, sizeof(info), NULL); + ok( status == STATUS_INVALID_INFO_CLASS, + "Failed to NtQuerySemaphore, expected STATUS_INVALID_INFO_CLASS, got %08x\n", status ); + status = pNtQuerySemaphore((HANDLE)0xdeadbeef, SemaphoreBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_INVALID_HANDLE, + "Failed to NtQuerySemaphore, expected STATUS_INVALID_HANDLE, got %08x\n", status ); + + len = -1; + memset(&info, 0xcc, sizeof(info)); + status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, sizeof(info), &len); + ok( status == STATUS_SUCCESS, "NtQuerySemaphore failed %08x\n", status ); + ok( info.CurrentCount == 1, "expected 1, got %d\n", info.CurrentCount ); + ok( info.MaximumCount == 2, "expected 2, got %d\n", info.MaximumCount ); + ok( len == sizeof(info), "got %u\n", len ); + + ret = WaitForSingleObject( semaphore, 1000 ); + ok( ret == WAIT_OBJECT_0, "WaitForSingleObject failed %08x\n", ret ); + + memset(&info, 0xcc, sizeof(info)); + status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQuerySemaphore failed %08x\n", status ); + ok( info.CurrentCount == 0, "expected 0, got %d\n", info.CurrentCount ); + ok( info.MaximumCount == 2, "expected 2, got %d\n", info.MaximumCount ); + + prev = 0xdeadbeef; + status = pNtReleaseSemaphore(semaphore, 3, &prev); + ok( status == STATUS_SEMAPHORE_LIMIT_EXCEEDED, "NtReleaseSemaphore failed %08x\n", status ); + ok( prev == 0xdeadbeef, "NtReleaseSemaphore failed, expected 0xdeadbeef, got %d\n", prev ); + + prev = 0xdeadbeef; + status = pNtReleaseSemaphore(semaphore, 1, &prev); + ok( status == STATUS_SUCCESS, "NtReleaseSemaphore failed %08x\n", status ); + ok( prev == 0, "NtReleaseSemaphore failed, expected 0, got %d\n", prev ); + + prev = 0xdeadbeef; + status = pNtReleaseSemaphore(semaphore, 1, &prev); + ok( status == STATUS_SUCCESS, "NtReleaseSemaphore failed %08x\n", status ); + ok( prev == 1, "NtReleaseSemaphore failed, expected 1, got %d\n", prev ); + + prev = 0xdeadbeef; + status = pNtReleaseSemaphore(semaphore, 1, &prev); + ok( status == STATUS_SEMAPHORE_LIMIT_EXCEEDED, "NtReleaseSemaphore failed %08x\n", status ); + ok( prev == 0xdeadbeef, "NtReleaseSemaphore failed, expected 0xdeadbeef, got %d\n", prev ); + + memset(&info, 0xcc, sizeof(info)); + status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQuerySemaphore failed %08x\n", status ); + ok( info.CurrentCount == 2, "expected 2, got %d\n", info.CurrentCount ); + ok( info.MaximumCount == 2, "expected 2, got %d\n", info.MaximumCount ); + + NtClose( semaphore ); +} + static void test_wait_on_address(void) { DWORD ticks; @@ -2178,6 +2255,7 @@ START_TEST(om) pNtQuerySymbolicLinkObject = (void *)GetProcAddress(hntdll, "NtQuerySymbolicLinkObject"); pNtCreateSemaphore = (void *)GetProcAddress(hntdll, "NtCreateSemaphore"); pNtOpenSemaphore = (void *)GetProcAddress(hntdll, "NtOpenSemaphore"); + pNtQuerySemaphore = (void *)GetProcAddress(hntdll, "NtQuerySemaphore"); pNtCreateTimer = (void *)GetProcAddress(hntdll, "NtCreateTimer"); pNtOpenTimer = (void *)GetProcAddress(hntdll, "NtOpenTimer"); pNtCreateSection = (void *)GetProcAddress(hntdll, "NtCreateSection"); @@ -2207,6 +2285,7 @@ START_TEST(om) test_type_mismatch(); test_event(); test_mutant(); + test_semaphore(); test_keyed_events(); test_null_device(); test_wait_on_address(); -- 2.25.1

1 0

[PATCH] ws2_32: WSAEWOULDBLOCK is not an error but a condition that the calling program needs to handle
by Jeff Latimer Jan. 16, 2021

Jan. 16, 2021

--- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

Proper way to chain-inject DLLs into wine?
by Cláudio Sampaio Jan. 16, 2021

Jan. 16, 2021

Hi all, I have an interesting problem which so far I have been unable to solve, and I'd like to consult your expertise on this. I've looked through the winehq docs extensively and even tried to look at the source code of wine but couldn't figure it out. Here's the problem: MotherVR - https://github.com/Nibre/MotherVR/releases - is a replacement dxgi.dll for Alien: Isolation on Windows that intercepts DirectX calls in order to show the game in Virtual Reality using SteamVR/openvr. It acts this way by being put into the executable directory and by itself it calls the functions in the original DirectX dxgi.dll. How could I reproduce this injection in wine? I know dxvk is not supported and it not part of the wine project, but in any case regard this as a broader theoretical question. In that case, I would need MotherVR's dxgi.dll to be loaded first, then internally call the functions in dxvk's dxgi.dll for it to work, right? I've tried many combinations with WINEDLLOVERRIDES to no avail, hasn't worked so far. Would I have to change the source code of wine, dxvk, or MotherVR? MotherVR is still not open-source although it is planned to be. Also, I wonder if this DLL injection would have memory alignment issues, requiring patches like "Map Image Top Down" - https://github.com/hdmap/wine-hackery/blob/master/f4se/mapimagetopdown.patch -- to work? (this patch is required for the Skyrim Script Extender DLL to work on Linux) Please advise! -- Cláudio "Patola" Sampaio MakerLinux Labs - Campinas, SP Resume <https://github.com/Patola/resume> Gmail <patola(a)gmail.com> - MakerLinux <patola(a)makerlinux.com.br> - YOUTUBE <https://www.youtube.com/user/makerlinux>! Facebook <https://www.facebook.com/patolinux> - Facebook da MakerLinux <https://www.facebook.com/makerlinux> - Lattes <http://buscatextual.cnpq.br/buscatextual/visualizacv.do?id=K4763932Z5>

3 3

[PATCH 4/4] gdiplus: Record logical DPI in metafile.
by Ziqing Hui Jan. 16, 2021

Jan. 16, 2021

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/metafile.c | 18 +++++++++++++----- dlls/gdiplus/tests/metafile.c | 2 -- 3 files changed, 15 insertions(+), 7 deletions(-)

1 0

[PATCH 3/4] gdiplus/tests: Add initial tests for metafile created from printer DC.
by Ziqing Hui Jan. 16, 2021

Jan. 16, 2021

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

1 0

[PATCH 1/5] winegstreamer: Rename gstdemux_source to parser_source.
by Zebediah Figura Jan. 15, 2021

Jan. 15, 2021

"gstdemux" is not a very specific name, or accurate (it does not always demux, nor is it the only object which may demux using GStreamer). Also, while it does not risk colliding with GStreamer definitions as-is (lacking an underscore), I am inclined to avoid using "gst" or "gstreamer" as a prefix for our definitions, simply for the sake of clarity. "parser" is the common term for both DirectShow filters and GStreamer elements which "drive" the pipeline, i.e. explicitly pull data from upstream and push data downstream. While it's arguably still not specific enough (i.e. should be specifically identified as a DirectShow parser), I think that the differing terminology in Media Foundation (where the counterpart is a "media source") makes the choice of a shorter name justifiable. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 100 +++++++++++++++++----------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 0243f8e20c1..19b7667bb06 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -54,7 +54,7 @@ struct gstdemux struct strmbase_sink sink; IAsyncReader *reader; - struct gstdemux_source **sources; + struct parser_source **sources; unsigned int source_count; BOOL enum_sink_first; @@ -70,11 +70,11 @@ struct gstdemux HANDLE push_thread; BOOL (*init_gst)(struct gstdemux *filter); - HRESULT (*source_query_accept)(struct gstdemux_source *pin, const AM_MEDIA_TYPE *mt); - HRESULT (*source_get_media_type)(struct gstdemux_source *pin, unsigned int index, AM_MEDIA_TYPE *mt); + HRESULT (*source_query_accept)(struct parser_source *pin, const AM_MEDIA_TYPE *mt); + HRESULT (*source_get_media_type)(struct parser_source *pin, unsigned int index, AM_MEDIA_TYPE *mt); }; -struct gstdemux_source +struct parser_source { struct strmbase_source pin; IQualityControl IQualityControl_iface; @@ -95,7 +95,7 @@ static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0}; static const IMediaSeekingVtbl GST_Seeking_Vtbl; static const IQualityControlVtbl GSTOutPin_QualityControl_Vtbl; -static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR *name); +static struct parser_source *create_pin(struct gstdemux *filter, const WCHAR *name); static HRESULT GST_RemoveOutputPins(struct gstdemux *This); static HRESULT WINAPI GST_ChangeCurrent(IMediaSeeking *iface); static HRESULT WINAPI GST_ChangeStop(IMediaSeeking *iface); @@ -479,7 +479,7 @@ static GstCaps *amt_to_gst_caps(const AM_MEDIA_TYPE *mt) static gboolean query_sink(GstPad *pad, GstObject *parent, GstQuery *query) { - struct gstdemux_source *pin = gst_pad_get_element_private(pad); + struct parser_source *pin = gst_pad_get_element_private(pad); TRACE("pin %p, type \"%s\".\n", pin, gst_query_type_get_name(query->type)); @@ -654,7 +654,7 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) { - struct gstdemux_source *pin = gst_pad_get_element_private(pad); + struct parser_source *pin = gst_pad_get_element_private(pad); gboolean ret; TRACE("pin %p, type \"%s\".\n", pin, GST_EVENT_TYPE_NAME(event)); @@ -796,7 +796,7 @@ static DWORD CALLBACK push_data(LPVOID iface) return 0; } -static HRESULT send_sample(struct gstdemux_source *pin, IMediaSample *sample, +static HRESULT send_sample(struct parser_source *pin, IMediaSample *sample, GstBuffer *buf, GstMapInfo *info, gsize offset, gsize size, DWORD bytes_per_second) { HRESULT hr; @@ -861,7 +861,7 @@ static HRESULT send_sample(struct gstdemux_source *pin, IMediaSample *sample, static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *buf) { - struct gstdemux_source *pin = gst_pad_get_element_private(pad); + struct parser_source *pin = gst_pad_get_element_private(pad); struct gstdemux *This = impl_from_strmbase_filter(pin->pin.pin.filter); HRESULT hr = S_OK; IMediaSample *sample; @@ -1006,7 +1006,7 @@ static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) for (i = 0; i < filter->source_count; ++i) { - struct gstdemux_source *pin = filter->sources[i]; + struct parser_source *pin = filter->sources[i]; if (pin->their_src == pad) { @@ -1032,7 +1032,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * char *name; GstCaps *caps; GstStructure *arg; - struct gstdemux_source *pin; + struct parser_source *pin; int ret; WCHAR nameW[128]; @@ -1189,7 +1189,7 @@ static void existing_new_pad(GstElement *bin, GstPad *pad, gpointer user) for (i = 0; i < This->source_count; ++i) { - struct gstdemux_source *pin = This->sources[i]; + struct parser_source *pin = This->sources[i]; if (!pin->their_src) { gst_segment_init(pin->segment, GST_FORMAT_TIME); @@ -1415,9 +1415,9 @@ static LONGLONG query_duration(GstPad *pad) return 0; } -static inline struct gstdemux_source *impl_from_IMediaSeeking(IMediaSeeking *iface) +static inline struct parser_source *impl_from_IMediaSeeking(IMediaSeeking *iface) { - return CONTAINING_RECORD(iface, struct gstdemux_source, seek.IMediaSeeking_iface); + return CONTAINING_RECORD(iface, struct parser_source, seek.IMediaSeeking_iface); } static struct strmbase_pin *gstdemux_get_pin(struct strmbase_filter *base, unsigned int index) @@ -1675,7 +1675,7 @@ static BOOL gstdecoder_init_gst(struct gstdemux *filter) for (i = 0; i < filter->source_count; ++i) { - struct gstdemux_source *pin = filter->sources[i]; + struct parser_source *pin = filter->sources[i]; const HANDLE events[2] = {pin->caps_event, filter->error_event}; pin->seek.llDuration = pin->seek.llStop = query_duration(pin->their_src); @@ -1692,7 +1692,7 @@ static BOOL gstdecoder_init_gst(struct gstdemux *filter) return TRUE; } -static HRESULT gstdecoder_source_query_accept(struct gstdemux_source *pin, const AM_MEDIA_TYPE *mt) +static HRESULT gstdecoder_source_query_accept(struct parser_source *pin, const AM_MEDIA_TYPE *mt) { /* At least make sure we can convert it to GstCaps. */ GstCaps *caps = amt_to_gst_caps(mt); @@ -1703,7 +1703,7 @@ static HRESULT gstdecoder_source_query_accept(struct gstdemux_source *pin, const return S_OK; } -static HRESULT gstdecoder_source_get_media_type(struct gstdemux_source *pin, +static HRESULT gstdecoder_source_get_media_type(struct parser_source *pin, unsigned int index, AM_MEDIA_TYPE *mt) { GstCaps *caps = gst_pad_get_current_caps(pin->my_sink); @@ -1870,21 +1870,21 @@ static const IAMStreamSelectVtbl stream_select_vtbl = static HRESULT WINAPI GST_ChangeCurrent(IMediaSeeking *iface) { - struct gstdemux_source *This = impl_from_IMediaSeeking(iface); + struct parser_source *This = impl_from_IMediaSeeking(iface); TRACE("(%p)\n", This); return S_OK; } static HRESULT WINAPI GST_ChangeStop(IMediaSeeking *iface) { - struct gstdemux_source *This = impl_from_IMediaSeeking(iface); + struct parser_source *This = impl_from_IMediaSeeking(iface); TRACE("(%p)\n", This); return S_OK; } static HRESULT WINAPI GST_ChangeRate(IMediaSeeking *iface) { - struct gstdemux_source *This = impl_from_IMediaSeeking(iface); + struct parser_source *This = impl_from_IMediaSeeking(iface); GstEvent *ev = gst_event_new_seek(This->seek.dRate, GST_FORMAT_TIME, 0, GST_SEEK_TYPE_NONE, -1, GST_SEEK_TYPE_NONE, -1); TRACE("(%p) New rate %g\n", This, This->seek.dRate); mark_wine_thread(); @@ -1894,19 +1894,19 @@ static HRESULT WINAPI GST_ChangeRate(IMediaSeeking *iface) static HRESULT WINAPI GST_Seeking_QueryInterface(IMediaSeeking *iface, REFIID riid, void **ppv) { - struct gstdemux_source *This = impl_from_IMediaSeeking(iface); + struct parser_source *This = impl_from_IMediaSeeking(iface); return IPin_QueryInterface(&This->pin.pin.IPin_iface, riid, ppv); } static ULONG WINAPI GST_Seeking_AddRef(IMediaSeeking *iface) { - struct gstdemux_source *This = impl_from_IMediaSeeking(iface); + struct parser_source *This = impl_from_IMediaSeeking(iface); return IPin_AddRef(&This->pin.pin.IPin_iface); } static ULONG WINAPI GST_Seeking_Release(IMediaSeeking *iface) { - struct gstdemux_source *This = impl_from_IMediaSeeking(iface); + struct parser_source *This = impl_from_IMediaSeeking(iface); return IPin_Release(&This->pin.pin.IPin_iface); } @@ -1914,7 +1914,7 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, LONGLONG *current, DWORD current_flags, LONGLONG *stop, DWORD stop_flags) { GstSeekType current_type = GST_SEEK_TYPE_SET, stop_type = GST_SEEK_TYPE_SET; - struct gstdemux_source *pin = impl_from_IMediaSeeking(iface); + struct parser_source *pin = impl_from_IMediaSeeking(iface); GstSeekFlags flags = 0; TRACE("pin %p, current %s, current_flags %#x, stop %s, stop_flags %#x.\n", @@ -1973,32 +1973,32 @@ static const IMediaSeekingVtbl GST_Seeking_Vtbl = SourceSeekingImpl_GetPreroll }; -static inline struct gstdemux_source *impl_from_IQualityControl( IQualityControl *iface ) +static inline struct parser_source *impl_from_IQualityControl( IQualityControl *iface ) { - return CONTAINING_RECORD(iface, struct gstdemux_source, IQualityControl_iface); + return CONTAINING_RECORD(iface, struct parser_source, IQualityControl_iface); } static HRESULT WINAPI GST_QualityControl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) { - struct gstdemux_source *pin = impl_from_IQualityControl(iface); + struct parser_source *pin = impl_from_IQualityControl(iface); return IPin_QueryInterface(&pin->pin.pin.IPin_iface, riid, ppv); } static ULONG WINAPI GST_QualityControl_AddRef(IQualityControl *iface) { - struct gstdemux_source *pin = impl_from_IQualityControl(iface); + struct parser_source *pin = impl_from_IQualityControl(iface); return IPin_AddRef(&pin->pin.pin.IPin_iface); } static ULONG WINAPI GST_QualityControl_Release(IQualityControl *iface) { - struct gstdemux_source *pin = impl_from_IQualityControl(iface); + struct parser_source *pin = impl_from_IQualityControl(iface); return IPin_Release(&pin->pin.pin.IPin_iface); } static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality q) { - struct gstdemux_source *pin = impl_from_IQualityControl(iface); + struct parser_source *pin = impl_from_IQualityControl(iface); GstQOSType type = GST_QOS_TYPE_OVERFLOW; GstClockTime timestamp; GstClockTimeDiff diff; @@ -2053,7 +2053,7 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil static HRESULT WINAPI GST_QualityControl_SetSink(IQualityControl *iface, IQualityControl *tonotify) { - struct gstdemux_source *pin = impl_from_IQualityControl(iface); + struct parser_source *pin = impl_from_IQualityControl(iface); TRACE("(%p)->(%p)\n", pin, pin); /* Do nothing */ return S_OK; @@ -2067,14 +2067,14 @@ static const IQualityControlVtbl GSTOutPin_QualityControl_Vtbl = { GST_QualityControl_SetSink }; -static inline struct gstdemux_source *impl_source_from_IPin(IPin *iface) +static inline struct parser_source *impl_source_from_IPin(IPin *iface) { - return CONTAINING_RECORD(iface, struct gstdemux_source, pin.pin.IPin_iface); + return CONTAINING_RECORD(iface, struct parser_source, pin.pin.IPin_iface); } static HRESULT source_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { - struct gstdemux_source *pin = impl_source_from_IPin(&iface->IPin_iface); + struct parser_source *pin = impl_source_from_IPin(&iface->IPin_iface); if (IsEqualGUID(iid, &IID_IMediaSeeking)) *out = &pin->seek.IMediaSeeking_iface; @@ -2089,14 +2089,14 @@ static HRESULT source_query_interface(struct strmbase_pin *iface, REFIID iid, vo static HRESULT source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) { - struct gstdemux_source *pin = impl_source_from_IPin(&iface->IPin_iface); + struct parser_source *pin = impl_source_from_IPin(&iface->IPin_iface); struct gstdemux *filter = impl_from_strmbase_filter(iface->filter); return filter->source_query_accept(pin, mt); } static HRESULT source_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) { - struct gstdemux_source *pin = impl_source_from_IPin(&iface->IPin_iface); + struct parser_source *pin = impl_source_from_IPin(&iface->IPin_iface); struct gstdemux *filter = impl_from_strmbase_filter(iface->filter); return filter->source_get_media_type(pin, index, mt); } @@ -2104,7 +2104,7 @@ static HRESULT source_get_media_type(struct strmbase_pin *iface, unsigned int in static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, IMemAllocator *allocator, ALLOCATOR_PROPERTIES *props) { - struct gstdemux_source *pin = impl_source_from_IPin(&iface->pin.IPin_iface); + struct parser_source *pin = impl_source_from_IPin(&iface->pin.IPin_iface); unsigned int buffer_size = 16384; ALLOCATOR_PROPERTIES ret_props; @@ -2131,7 +2131,7 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, return IMemAllocator_SetProperties(allocator, props, &ret_props); } -static void free_source_pin(struct gstdemux_source *pin) +static void free_source_pin(struct parser_source *pin) { if (pin->pin.pin.peer) { @@ -2174,9 +2174,9 @@ static const struct strmbase_source_ops source_ops = .pfnDecideBufferSize = GSTOutPin_DecideBufferSize, }; -static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR *name) +static struct parser_source *create_pin(struct gstdemux *filter, const WCHAR *name) { - struct gstdemux_source *pin, **new_array; + struct parser_source *pin, **new_array; char pad_name[19]; if (!(new_array = heap_realloc(filter->sources, (filter->source_count + 1) * sizeof(*new_array)))) @@ -2344,7 +2344,7 @@ static const struct strmbase_sink_ops wave_parser_sink_ops = static BOOL wave_parser_init_gst(struct gstdemux *filter) { static const WCHAR source_name[] = {'o','u','t','p','u','t',0}; - struct gstdemux_source *pin; + struct parser_source *pin; GstElement *element; HANDLE events[2]; int ret; @@ -2400,7 +2400,7 @@ static BOOL wave_parser_init_gst(struct gstdemux *filter) return TRUE; } -static gboolean get_source_amt(const struct gstdemux_source *pin, AM_MEDIA_TYPE *mt) +static gboolean get_source_amt(const struct parser_source *pin, AM_MEDIA_TYPE *mt) { GstCaps *caps = gst_pad_get_current_caps(pin->my_sink); gboolean ret = amt_from_gst_caps(caps, mt); @@ -2408,7 +2408,7 @@ static gboolean get_source_amt(const struct gstdemux_source *pin, AM_MEDIA_TYPE return ret; } -static HRESULT wave_parser_source_query_accept(struct gstdemux_source *pin, const AM_MEDIA_TYPE *mt) +static HRESULT wave_parser_source_query_accept(struct parser_source *pin, const AM_MEDIA_TYPE *mt) { AM_MEDIA_TYPE pad_mt; HRESULT hr; @@ -2420,7 +2420,7 @@ static HRESULT wave_parser_source_query_accept(struct gstdemux_source *pin, cons return hr; } -static HRESULT wave_parser_source_get_media_type(struct gstdemux_source *pin, +static HRESULT wave_parser_source_get_media_type(struct parser_source *pin, unsigned int index, AM_MEDIA_TYPE *mt) { if (index > 0) @@ -2510,7 +2510,7 @@ static BOOL avi_splitter_init_gst(struct gstdemux *filter) for (i = 0; i < filter->source_count; ++i) { - struct gstdemux_source *pin = filter->sources[i]; + struct parser_source *pin = filter->sources[i]; const HANDLE events[2] = {pin->caps_event, filter->error_event}; pin->seek.llDuration = pin->seek.llStop = query_duration(pin->their_src); @@ -2527,7 +2527,7 @@ static BOOL avi_splitter_init_gst(struct gstdemux *filter) return TRUE; } -static HRESULT avi_splitter_source_query_accept(struct gstdemux_source *pin, const AM_MEDIA_TYPE *mt) +static HRESULT avi_splitter_source_query_accept(struct parser_source *pin, const AM_MEDIA_TYPE *mt) { AM_MEDIA_TYPE pad_mt; HRESULT hr; @@ -2539,7 +2539,7 @@ static HRESULT avi_splitter_source_query_accept(struct gstdemux_source *pin, con return hr; } -static HRESULT avi_splitter_source_get_media_type(struct gstdemux_source *pin, +static HRESULT avi_splitter_source_get_media_type(struct parser_source *pin, unsigned int index, AM_MEDIA_TYPE *mt) { if (index > 0) @@ -2598,7 +2598,7 @@ static const struct strmbase_sink_ops mpeg_splitter_sink_ops = static BOOL mpeg_splitter_init_gst(struct gstdemux *filter) { static const WCHAR source_name[] = {'A','u','d','i','o',0}; - struct gstdemux_source *pin; + struct parser_source *pin; GstElement *element; HANDLE events[3]; DWORD res; @@ -2660,7 +2660,7 @@ static BOOL mpeg_splitter_init_gst(struct gstdemux *filter) return TRUE; } -static HRESULT mpeg_splitter_source_query_accept(struct gstdemux_source *pin, const AM_MEDIA_TYPE *mt) +static HRESULT mpeg_splitter_source_query_accept(struct parser_source *pin, const AM_MEDIA_TYPE *mt) { AM_MEDIA_TYPE pad_mt; HRESULT hr; @@ -2672,7 +2672,7 @@ static HRESULT mpeg_splitter_source_query_accept(struct gstdemux_source *pin, co return hr; } -static HRESULT mpeg_splitter_source_get_media_type(struct gstdemux_source *pin, +static HRESULT mpeg_splitter_source_get_media_type(struct parser_source *pin, unsigned int index, AM_MEDIA_TYPE *mt) { if (index > 0) -- 2.30.0

1 4

[PATCH 12/12] d2d1/tests: Run most tests on d3d11 as well.
by Henri Verbeet Jan. 15, 2021

Jan. 15, 2021

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v3: - Get rid of the "ctx" argument to release_d3d11_resource_readback(). dlls/d2d1/tests/Makefile.in | 2 +- dlls/d2d1/tests/d2d1.c | 352 +++++++++++++++++++++++++----------- 2 files changed, 247 insertions(+), 107 deletions(-) diff --git a/dlls/d2d1/tests/Makefile.in b/dlls/d2d1/tests/Makefile.in index 91ede7888aa..5eeb815e07f 100644 --- a/dlls/d2d1/tests/Makefile.in +++ b/dlls/d2d1/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d2d1.dll -IMPORTS = d2d1 d3d10_1 dwrite dxguid uuid user32 advapi32 ole32 gdi32 +IMPORTS = d2d1 d3d10_1 d3d11 dwrite dxguid uuid user32 advapi32 ole32 gdi32 C_SRCS = \ d2d1.c diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d38cd5649a6..3e7df715dda 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -21,6 +21,7 @@ #include <math.h> #include <float.h> #include "d2d1_1.h" +#include "d3d11.h" #include "wincrypt.h" #include "wine/test.h" #include "initguid.h" @@ -38,12 +39,14 @@ static BOOL use_mt = TRUE; static struct test_entry { - void (*test)(void); + void (*test)(BOOL d3d11); + BOOL d3d11; } *mt_tests; size_t mt_tests_size, mt_test_count; struct d2d1_test_context { + BOOL d3d11; IDXGIDevice *device; HWND window; IDXGISwapChain *swapchain; @@ -53,7 +56,12 @@ struct d2d1_test_context struct resource_readback { - ID3D10Resource *resource; + BOOL d3d11; + union + { + ID3D10Resource *d3d10_resource; + ID3D11Resource *d3d11_resource; + } u; unsigned int pitch, width, height; void *data; }; @@ -108,14 +116,26 @@ struct expected_geometry_figure const struct geometry_segment *segments; }; -static void queue_test(void (*test)(void)) +static void queue_d3d1x_test(void (*test)(BOOL d3d11), BOOL d3d11) { if (mt_test_count >= mt_tests_size) { mt_tests_size = max(16, mt_tests_size * 2); mt_tests = heap_realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); } - mt_tests[mt_test_count++].test = test; + mt_tests[mt_test_count].test = test; + mt_tests[mt_test_count++].d3d11 = d3d11; +} + +static void queue_d3d10_test(void (*test)(BOOL d3d11)) +{ + queue_d3d1x_test(test, FALSE); +} + +static void queue_test(void (*test)(BOOL d3d11)) +{ + queue_d3d1x_test(test, FALSE); + queue_d3d1x_test(test, TRUE); } static DWORD WINAPI thread_func(void *ctx) @@ -126,7 +146,7 @@ static DWORD WINAPI thread_func(void *ctx) { j = *i; if (InterlockedCompareExchange(i, j + 1, j) == j) - mt_tests[j].test(); + mt_tests[j].test(mt_tests[j].d3d11); } return 0; @@ -143,7 +163,7 @@ static void run_queued_tests(void) { for (i = 0; i < mt_test_count; ++i) { - mt_tests[i].test(); + mt_tests[i].test(mt_tests[i].d3d11); } return; @@ -311,9 +331,8 @@ static void cubic_to(ID2D1GeometrySink *sink, float x1, float y1, float x2, floa ID2D1GeometrySink_AddBezier(sink, &b); } -static void get_surface_readback(struct d2d1_test_context *ctx, struct resource_readback *rb) +static void get_d3d10_surface_readback(IDXGISurface *surface, struct resource_readback *rb) { - IDXGISurface *surface = ctx->surface; D3D10_TEXTURE2D_DESC texture_desc; D3D10_MAPPED_TEXTURE2D map_desc; DXGI_SURFACE_DESC surface_desc; @@ -338,27 +357,103 @@ static void get_surface_readback(struct d2d1_test_context *ctx, struct resource_ texture_desc.BindFlags = 0; texture_desc.CPUAccessFlags = D3D10_CPU_ACCESS_READ; texture_desc.MiscFlags = 0; - hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, (ID3D10Texture2D **)&rb->resource); + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, (ID3D10Texture2D **)&rb->u.d3d10_resource); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); rb->width = texture_desc.Width; rb->height = texture_desc.Height; - ID3D10Device_CopyResource(device, rb->resource, src_resource); + ID3D10Device_CopyResource(device, rb->u.d3d10_resource, src_resource); ID3D10Resource_Release(src_resource); ID3D10Device_Release(device); - hr = ID3D10Texture2D_Map((ID3D10Texture2D *)rb->resource, 0, D3D10_MAP_READ, 0, &map_desc); + hr = ID3D10Texture2D_Map((ID3D10Texture2D *)rb->u.d3d10_resource, 0, D3D10_MAP_READ, 0, &map_desc); + ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); + + rb->pitch = map_desc.RowPitch; + rb->data = map_desc.pData; +} + +static void get_d3d11_surface_readback(IDXGISurface *surface, struct resource_readback *rb) +{ + D3D11_TEXTURE2D_DESC texture_desc; + D3D11_MAPPED_SUBRESOURCE map_desc; + DXGI_SURFACE_DESC surface_desc; + ID3D11Resource *src_resource; + ID3D11DeviceContext *context; + ID3D11Device *device; + HRESULT hr; + + hr = IDXGISurface_GetDevice(surface, &IID_ID3D11Device, (void **)&device); + ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr); + hr = IDXGISurface_QueryInterface(surface, &IID_ID3D11Resource, (void **)&src_resource); + ok(SUCCEEDED(hr), "Failed to query resource interface, hr %#x.\n", hr); + + hr = IDXGISurface_GetDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + texture_desc.Width = surface_desc.Width; + texture_desc.Height = surface_desc.Height; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = surface_desc.Format; + texture_desc.SampleDesc = surface_desc.SampleDesc; + texture_desc.Usage = D3D11_USAGE_STAGING; + texture_desc.BindFlags = 0; + texture_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ; + texture_desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, (ID3D11Texture2D **)&rb->u.d3d11_resource); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + rb->width = texture_desc.Width; + rb->height = texture_desc.Height; + + ID3D11Device_GetImmediateContext(device, &context); + ID3D11DeviceContext_CopyResource(context, rb->u.d3d11_resource, src_resource); + ID3D11Resource_Release(src_resource); + ID3D11Device_Release(device); + + hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)rb->u.d3d11_resource, 0, D3D11_MAP_READ, 0, &map_desc); ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); + ID3D11DeviceContext_Release(context); rb->pitch = map_desc.RowPitch; rb->data = map_desc.pData; } +static void get_surface_readback(struct d2d1_test_context *ctx, struct resource_readback *rb) +{ + if ((rb->d3d11 = ctx->d3d11)) + get_d3d11_surface_readback(ctx->surface, rb); + else + get_d3d10_surface_readback(ctx->surface, rb); +} + +static void release_d3d10_resource_readback(struct resource_readback *rb) +{ + ID3D10Texture2D_Unmap((ID3D10Texture2D *)rb->u.d3d10_resource, 0); + ID3D10Resource_Release(rb->u.d3d10_resource); +} + +static void release_d3d11_resource_readback(struct resource_readback *rb) +{ + ID3D11DeviceContext *context; + ID3D11Device *device; + + ID3D11Resource_GetDevice(rb->u.d3d11_resource, &device); + ID3D11Device_GetImmediateContext(device, &context); + ID3D11Device_Release(device); + + ID3D11DeviceContext_Unmap(context, rb->u.d3d11_resource, 0); + ID3D11Resource_Release(rb->u.d3d11_resource); + ID3D11DeviceContext_Release(context); +} + static void release_resource_readback(struct resource_readback *rb) { - ID3D10Texture2D_Unmap((ID3D10Texture2D *)rb->resource, 0); - ID3D10Resource_Release(rb->resource); + if (rb->d3d11) + release_d3d11_resource_readback(rb); + else + release_d3d10_resource_readback(rb); } static DWORD get_readback_colour(struct resource_readback *rb, unsigned int x, unsigned int y) @@ -711,18 +806,47 @@ static ID3D10Device1 *create_d3d10_device(void) return NULL; } -static IDXGIDevice *create_device(void) +static ID3D11Device *create_d3d11_device(void) +{ + DWORD level = D3D_FEATURE_LEVEL_11_0; + ID3D11Device *device; + + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, + D3D10_CREATE_DEVICE_BGRA_SUPPORT, &level, 1, D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, + D3D10_CREATE_DEVICE_BGRA_SUPPORT, &level, 1, D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, + D3D10_CREATE_DEVICE_BGRA_SUPPORT, &level, 1, D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + + return NULL; +} + +static IDXGIDevice *create_device(BOOL d3d11) { ID3D10Device1 *d3d10_device; + ID3D11Device *d3d11_device; IDXGIDevice *device; HRESULT hr; - if (!(d3d10_device = create_d3d10_device())) - return NULL; + if (d3d11) + { + if (!(d3d11_device = create_d3d11_device())) + return NULL; + hr = ID3D11Device_QueryInterface(d3d11_device, &IID_IDXGIDevice, (void **)&device); + ID3D11Device_Release(d3d11_device); + } + else + { + if (!(d3d10_device = create_d3d10_device())) + return NULL; + hr = ID3D10Device1_QueryInterface(d3d10_device, &IID_IDXGIDevice, (void **)&device); + ID3D10Device1_Release(d3d10_device); + } - hr = ID3D10Device1_QueryInterface(d3d10_device, &IID_IDXGIDevice, (void **)&device); ok(SUCCEEDED(hr), "Failed to get DXGI device, hr %#x.\n", hr); - ID3D10Device1_Release(d3d10_device); return device; } @@ -787,7 +911,8 @@ static IDXGISwapChain *create_d3d10_swapchain(ID3D10Device1 *device, HWND window return swapchain; } -static ID2D1RenderTarget *create_render_target_desc(IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc) +static ID2D1RenderTarget *create_render_target_desc(IDXGISurface *surface, + const D2D1_RENDER_TARGET_PROPERTIES *desc, BOOL d3d11) { ID2D1RenderTarget *render_target; ID2D1Factory *factory; @@ -796,13 +921,16 @@ static ID2D1RenderTarget *create_render_target_desc(IDXGISurface *surface, const hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(factory, surface, desc, &render_target); - ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + todo_wine_if(d3d11) ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); ID2D1Factory_Release(factory); + if (FAILED(hr)) + return NULL; + return render_target; } -static ID2D1RenderTarget *create_render_target(IDXGISurface *surface) +static ID2D1RenderTarget *create_render_target(IDXGISurface *surface, BOOL d3d11) { D2D1_RENDER_TARGET_PROPERTIES desc; @@ -814,7 +942,7 @@ static ID2D1RenderTarget *create_render_target(IDXGISurface *surface) desc.usage = D2D1_RENDER_TARGET_USAGE_NONE; desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT; - return create_render_target_desc(surface, &desc); + return create_render_target_desc(surface, &desc, d3d11); } #define release_test_context(ctx) release_test_context_(__LINE__, ctx) @@ -834,14 +962,15 @@ static void release_test_context_(unsigned int line, struct d2d1_test_context *c IDXGIDevice_Release(ctx->device); } -#define init_test_context(ctx) init_test_context_(__LINE__, ctx) -static BOOL init_test_context_(unsigned int line, struct d2d1_test_context *ctx) +#define init_test_context(ctx, d3d11) init_test_context_(__LINE__, ctx, d3d11) +static BOOL init_test_context_(unsigned int line, struct d2d1_test_context *ctx, BOOL d3d11) { HRESULT hr; memset(ctx, 0, sizeof(*ctx)); - if (!(ctx->device = create_device())) + ctx->d3d11 = d3d11; + if (!(ctx->device = create_device(d3d11))) { skip_(__FILE__, line)("Failed to create device, skipping tests.\n"); return FALSE; @@ -854,7 +983,18 @@ static BOOL init_test_context_(unsigned int line, struct d2d1_test_context *ctx) hr = IDXGISwapChain_GetBuffer(ctx->swapchain, 0, &IID_IDXGISurface, (void **)&ctx->surface); ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); - ctx->rt = create_render_target(ctx->surface); + ctx->rt = create_render_target(ctx->surface, d3d11); + if (!ctx->rt && d3d11) + { + todo_wine win_skip_(__FILE__, line)("Skipping d3d11 tests.\n"); + + IDXGISurface_Release(ctx->surface); + IDXGISwapChain_Release(ctx->swapchain); + DestroyWindow(ctx->window); + IDXGIDevice_Release(ctx->device); + + return FALSE; + } ok_(__FILE__, line)(!!ctx->rt, "Failed to create render target.\n"); return TRUE; @@ -1166,7 +1306,7 @@ static void geometry_sink_check_(unsigned int line, const struct geometry_sink * } } -static void test_clip(void) +static void test_clip(BOOL d3d11) { struct d2d1_test_context ctx; D2D1_MATRIX_3X2_F matrix; @@ -1186,7 +1326,7 @@ static void test_clip(void) 0.0f, 0.0f, }}}; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; rt = ctx.rt; @@ -1358,7 +1498,7 @@ static void test_clip(void) release_test_context(&ctx); } -static void test_state_block(void) +static void test_state_block(BOOL d3d11) { IDWriteRenderingParams *text_rendering_params1, *text_rendering_params2; D2D1_DRAWING_STATE_DESCRIPTION drawing_state; @@ -1389,7 +1529,7 @@ static void test_state_block(void) 11.0f, 12.0f, }}}; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; rt = ctx.rt; @@ -1618,7 +1758,7 @@ static void test_state_block(void) release_test_context(&ctx); } -static void test_color_brush(void) +static void test_color_brush(BOOL d3d11) { D2D1_MATRIX_3X2_F matrix, tmp_matrix; D2D1_BRUSH_PROPERTIES brush_desc; @@ -1631,7 +1771,7 @@ static void test_color_brush(void) HRESULT hr; BOOL match; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; rt = ctx.rt; @@ -1703,7 +1843,7 @@ static void test_color_brush(void) release_test_context(&ctx); } -static void test_bitmap_brush(void) +static void test_bitmap_brush(BOOL d3d11) { D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode; ID2D1TransformedGeometry *transformed_geometry; @@ -1756,7 +1896,7 @@ static void test_bitmap_brush(void) 0xffffffff, 0xff000000, 0xff000000, 0xff000000, }; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; rt = ctx.rt; @@ -2096,7 +2236,7 @@ static void test_bitmap_brush(void) release_test_context(&ctx); } -static void test_linear_brush(void) +static void test_linear_brush(BOOL d3d11) { D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES gradient_properties; ID2D1GradientStopCollection *gradient, *tmp_gradient; @@ -2153,7 +2293,7 @@ static void test_linear_brush(void) {520, 390, 0xff90ae40}, }; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; rt = ctx.rt; @@ -2287,7 +2427,7 @@ static void test_linear_brush(void) release_test_context(&ctx); } -static void test_radial_brush(void) +static void test_radial_brush(BOOL d3d11) { D2D1_RADIAL_GRADIENT_BRUSH_PROPERTIES gradient_properties; ID2D1GradientStopCollection *gradient, *tmp_gradient; @@ -2344,7 +2484,7 @@ static void test_radial_brush(void) {520, 390, 0xff4059e6}, }; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; rt = ctx.rt; @@ -2601,7 +2741,7 @@ static void fill_geometry_sink_bezier(ID2D1GeometrySink *sink, unsigned int holl ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); } -static void test_path_geometry(void) +static void test_path_geometry(BOOL d3d11) { ID2D1TransformedGeometry *transformed_geometry; D2D1_MATRIX_3X2_F matrix, tmp_matrix; @@ -2934,7 +3074,7 @@ static void test_path_geometry(void) {D2D1_FIGURE_BEGIN_HOLLOW, D2D1_FIGURE_END_OPEN, { 40.0f, 20.0f}, 2, &expected_segments[172]}, }; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; rt = ctx.rt; @@ -3660,7 +3800,7 @@ static void test_path_geometry(void) release_test_context(&ctx); } -static void test_rectangle_geometry(void) +static void test_rectangle_geometry(BOOL d3d11) { ID2D1TransformedGeometry *transformed_geometry; ID2D1RectangleGeometry *geometry; @@ -3941,7 +4081,7 @@ static void test_rectangle_geometry(void) ID2D1Factory_Release(factory); } -static void test_rounded_rectangle_geometry(void) +static void test_rounded_rectangle_geometry(BOOL d3d11) { ID2D1RoundedRectangleGeometry *geometry; D2D1_ROUNDED_RECT rect, rect2; @@ -3987,7 +4127,7 @@ static void test_rounded_rectangle_geometry(void) ID2D1Factory_Release(factory); } -static void test_bitmap_formats(void) +static void test_bitmap_formats(BOOL d3d11) { D2D1_BITMAP_PROPERTIES bitmap_desc; struct d2d1_test_context ctx; @@ -4020,7 +4160,7 @@ static void test_bitmap_formats(void) {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, 0x8a}, }; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; rt = ctx.rt; @@ -4050,7 +4190,7 @@ static void test_bitmap_formats(void) release_test_context(&ctx); } -static void test_alpha_mode(void) +static void test_alpha_mode(BOOL d3d11) { D2D1_RENDER_TARGET_PROPERTIES rt_desc; D2D1_BITMAP_PROPERTIES bitmap_desc; @@ -4074,7 +4214,7 @@ static void test_alpha_mode(void) 0x7f7f7f7f, 0x7f000000, 0x7f000000, 0x7f000000, }; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; rt = ctx.rt; @@ -4169,7 +4309,7 @@ static void test_alpha_mode(void) rt_desc.dpiY = 0.0f; rt_desc.usage = D2D1_RENDER_TARGET_USAGE_NONE; rt_desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT; - rt = create_render_target_desc(ctx.surface, &rt_desc); + rt = create_render_target_desc(ctx.surface, &rt_desc, d3d11); ok(!!rt, "Failed to create render target.\n"); ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED); @@ -4264,7 +4404,7 @@ static void test_alpha_mode(void) release_test_context(&ctx); } -static void test_shared_bitmap(void) +static void test_shared_bitmap(BOOL d3d11) { IWICBitmap *wic_bitmap1, *wic_bitmap2; ID2D1GdiInteropRenderTarget *interop; @@ -4285,7 +4425,7 @@ static void test_shared_bitmap(void) HWND window2; HRESULT hr; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; window2 = create_window(); @@ -4350,7 +4490,7 @@ static void test_shared_bitmap(void) /* DXGI surface render targets with different devices but the same factory. */ IDXGISurface_Release(surface2); IDXGISwapChain_Release(swapchain2); - device2 = create_device(); + device2 = create_device(d3d11); ok(!!device2, "Failed to create device.\n"); swapchain2 = create_swapchain(device2, window2, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain2, 0, &IID_IDXGISurface, (void **)&surface2); @@ -4511,7 +4651,7 @@ static void test_shared_bitmap(void) CoUninitialize(); } -static void test_bitmap_updates(void) +static void test_bitmap_updates(BOOL d3d11) { D2D1_BITMAP_PROPERTIES bitmap_desc; struct d2d1_test_context ctx; @@ -4532,7 +4672,7 @@ static void test_bitmap_updates(void) 0xffffffff, 0xff000000, 0xff000000, 0xff000000, }; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; rt = ctx.rt; @@ -4599,7 +4739,7 @@ static void test_bitmap_updates(void) release_test_context(&ctx); } -static void test_opacity_brush(void) +static void test_opacity_brush(BOOL d3d11) { ID2D1BitmapBrush *bitmap_brush, *opacity_brush; D2D1_BITMAP_PROPERTIES bitmap_desc; @@ -4625,7 +4765,7 @@ static void test_opacity_brush(void) 0xffffffff, 0x40000000, 0x40000000, 0xff000000, }; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; rt = ctx.rt; @@ -4765,7 +4905,7 @@ static void test_opacity_brush(void) release_test_context(&ctx); } -static void test_create_target(void) +static void test_create_target(BOOL d3d11) { struct d2d1_test_context ctx; ID2D1Factory *factory; @@ -4788,7 +4928,7 @@ static void test_create_target(void) }; unsigned int i; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); @@ -4843,7 +4983,7 @@ static void test_create_target(void) release_test_context(&ctx); } -static void test_draw_text_layout(void) +static void test_draw_text_layout(BOOL d3d11) { static const struct { @@ -4892,7 +5032,7 @@ static void test_draw_text_layout(void) D2D1_RECT_F rect; unsigned int i; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; @@ -5021,7 +5161,7 @@ static void create_target_dibsection(HDC hdc, UINT32 width, UINT32 height) DeleteObject(SelectObject(hdc, hbm)); } -static void test_dc_target(void) +static void test_dc_target(BOOL d3d11) { static const D2D1_PIXEL_FORMAT invalid_formats[] = { @@ -5051,7 +5191,7 @@ static void test_dc_target(void) HRESULT hr; RECT rect; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; release_test_context(&ctx); @@ -5249,7 +5389,7 @@ todo_wine ID2D1Factory_Release(factory); } -static void test_hwnd_target(void) +static void test_hwnd_target(BOOL d3d11) { D2D1_HWND_RENDER_TARGET_PROPERTIES hwnd_rt_desc; ID2D1GdiInteropRenderTarget *interop; @@ -5261,7 +5401,7 @@ static void test_hwnd_target(void) D2D1_SIZE_U size; HRESULT hr; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; release_test_context(&ctx); @@ -5409,7 +5549,7 @@ static void test_compatible_target_size_(unsigned int line, ID2D1RenderTarget *r ID2D1BitmapRenderTarget_Release(bitmap_rt); } -static void test_bitmap_target(void) +static void test_bitmap_target(BOOL d3d11) { D2D1_HWND_RENDER_TARGET_PROPERTIES hwnd_rt_desc; ID2D1GdiInteropRenderTarget *interop; @@ -5428,7 +5568,7 @@ static void test_bitmap_target(void) ULONG refcount; HRESULT hr; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; release_test_context(&ctx); @@ -5595,7 +5735,7 @@ static void test_bitmap_target(void) ID2D1Factory_Release(factory); } -static void test_desktop_dpi(void) +static void test_desktop_dpi(BOOL d3d11) { ID2D1Factory *factory; float dpi_x, dpi_y; @@ -5611,7 +5751,7 @@ static void test_desktop_dpi(void) ID2D1Factory_Release(factory); } -static void test_stroke_style(void) +static void test_stroke_style(BOOL d3d11) { static const struct { @@ -5755,7 +5895,7 @@ static void test_stroke_style(void) ID2D1Factory_Release(factory); } -static void test_gradient(void) +static void test_gradient(BOOL d3d11) { ID2D1GradientStopCollection *gradient; D2D1_GRADIENT_STOP stops[3], stops2[3]; @@ -5766,7 +5906,7 @@ static void test_gradient(void) UINT32 count; HRESULT hr; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; rt = ctx.rt; @@ -5798,7 +5938,7 @@ static void test_gradient(void) release_test_context(&ctx); } -static void test_draw_geometry(void) +static void test_draw_geometry(BOOL d3d11) { ID2D1TransformedGeometry *transformed_geometry[4]; ID2D1RectangleGeometry *rect_geometry[2]; @@ -5818,7 +5958,7 @@ static void test_draw_geometry(void) HRESULT hr; BOOL match; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; rt = ctx.rt; @@ -6710,7 +6850,7 @@ static void test_draw_geometry(void) release_test_context(&ctx); } -static void test_fill_geometry(void) +static void test_fill_geometry(BOOL d3d11) { ID2D1TransformedGeometry *transformed_geometry[4]; ID2D1RectangleGeometry *rect_geometry[2]; @@ -6729,7 +6869,7 @@ static void test_fill_geometry(void) HRESULT hr; BOOL match; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; rt = ctx.rt; @@ -7508,7 +7648,7 @@ static void test_fill_geometry(void) release_test_context(&ctx); } -static void test_gdi_interop(void) +static void test_gdi_interop(BOOL d3d11) { ID2D1GdiInteropRenderTarget *interop; D2D1_RENDER_TARGET_PROPERTIES desc; @@ -7524,7 +7664,7 @@ static void test_gdi_interop(void) RECT rect; HDC dc; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); @@ -7639,7 +7779,7 @@ todo_wine release_test_context(&ctx); } -static void test_layer(void) +static void test_layer(BOOL d3d11) { ID2D1Factory *factory, *layer_factory; struct d2d1_test_context ctx; @@ -7648,7 +7788,7 @@ static void test_layer(void) D2D1_SIZE_F size; HRESULT hr; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; rt = ctx.rt; @@ -7679,7 +7819,7 @@ static void test_layer(void) release_test_context(&ctx); } -static void test_bezier_intersect(void) +static void test_bezier_intersect(BOOL d3d11) { D2D1_POINT_2F point = {0.0f, 0.0f}; struct d2d1_test_context ctx; @@ -7692,7 +7832,7 @@ static void test_bezier_intersect(void) HRESULT hr; BOOL match; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; rt = ctx.rt; @@ -7813,7 +7953,7 @@ static void test_bezier_intersect(void) release_test_context(&ctx); } -static void test_create_device(void) +static void test_create_device(BOOL d3d11) { D2D1_CREATION_PROPERTIES properties = {0}; struct d2d1_test_context ctx; @@ -7823,7 +7963,7 @@ static void test_create_device(void) ULONG refcount; HRESULT hr; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) @@ -8048,7 +8188,7 @@ static IDXGISurface *create_surface(IDXGIDevice *dxgi_device, DXGI_FORMAT format return surface; } -static void test_bitmap_surface(void) +static void test_bitmap_surface(BOOL d3d11) { static const struct bitmap_format_test { @@ -8095,7 +8235,7 @@ static void test_bitmap_surface(void) IWICBitmap *wic_bitmap; IWICImagingFactory *wic_factory; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) @@ -8283,7 +8423,7 @@ static void test_bitmap_surface(void) release_test_context(&ctx); } -static void test_device_context(void) +static void test_device_context(BOOL d3d11) { D2D1_HWND_RENDER_TARGET_PROPERTIES hwnd_rt_desc; D2D1_RENDER_TARGET_PROPERTIES rt_desc; @@ -8305,7 +8445,7 @@ static void test_device_context(void) IWICBitmap *wic_bitmap; IWICImagingFactory *wic_factory; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) @@ -8470,7 +8610,7 @@ todo_wine release_test_context(&ctx); } -static void test_invert_matrix(void) +static void test_invert_matrix(BOOL d3d11) { static const struct { @@ -8553,7 +8693,7 @@ static void test_invert_matrix(void) } } -static void test_skew_matrix(void) +static void test_skew_matrix(BOOL d3d11) { static const struct { @@ -8591,7 +8731,7 @@ static void test_skew_matrix(void) } } -static ID2D1DeviceContext *create_device_context(ID2D1Factory1 *factory, IDXGIDevice *dxgi_device) +static ID2D1DeviceContext *create_device_context(ID2D1Factory1 *factory, IDXGIDevice *dxgi_device, BOOL d3d11) { ID2D1DeviceContext *device_context; ID2D1Device *device; @@ -8607,7 +8747,7 @@ static ID2D1DeviceContext *create_device_context(ID2D1Factory1 *factory, IDXGIDe return device_context; } -static void test_command_list(void) +static void test_command_list(BOOL d3d11) { static const DWORD bitmap_data[] = { @@ -8641,7 +8781,7 @@ static void test_command_list(void) ULONG refcount; HRESULT hr; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) @@ -8651,7 +8791,7 @@ static void test_command_list(void) return; } - device_context = create_device_context(factory, ctx.device); + device_context = create_device_context(factory, ctx.device, d3d11); ok(device_context != NULL, "Failed to create device context.\n"); hr = ID2D1DeviceContext_CreateCommandList(device_context, &command_list); @@ -8837,7 +8977,7 @@ todo_wine ID2D1CommandList_Release(command_list); /* List created with different context. */ - device_context2 = create_device_context(factory, ctx.device); + device_context2 = create_device_context(factory, ctx.device, d3d11); ok(device_context2 != NULL, "Failed to create device context.\n"); hr = ID2D1DeviceContext_CreateCommandList(device_context, &command_list); @@ -8856,7 +8996,7 @@ todo_wine release_test_context(&ctx); } -static void test_max_bitmap_size(void) +static void test_max_bitmap_size(BOOL d3d11) { D2D1_RENDER_TARGET_PROPERTIES desc; D2D1_BITMAP_PROPERTIES bitmap_desc; @@ -8974,7 +9114,7 @@ static void test_max_bitmap_size(void) ID2D1Factory_Release(factory); } -static void test_dpi(void) +static void test_dpi(BOOL d3d11) { D2D1_BITMAP_PROPERTIES1 bitmap_desc; ID2D1DeviceContext *device_context; @@ -9005,7 +9145,7 @@ static void test_dpi(void) static const float dc_dpi_x = 120.0f, dc_dpi_y = 144.0f; unsigned int i; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) @@ -9016,7 +9156,7 @@ static void test_dpi(void) } - device_context = create_device_context(factory, ctx.device); + device_context = create_device_context(factory, ctx.device, d3d11); ok(!!device_context, "Failed to create device context.\n"); ID2D1DeviceContext_GetDpi(device_context, &dpi_x, &dpi_y); @@ -9186,7 +9326,7 @@ static void test_dpi(void) release_test_context(&ctx); } -static void test_wic_bitmap_format(void) +static void test_wic_bitmap_format(BOOL d3d11) { IWICImagingFactory *wic_factory; struct d2d1_test_context ctx; @@ -9209,7 +9349,7 @@ static void test_wic_bitmap_format(void) {&GUID_WICPixelFormat32bppBGR, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE}}, }; - if (!init_test_context(&ctx)) + if (!init_test_context(&ctx, d3d11)) return; rt = ctx.rt; @@ -9243,7 +9383,7 @@ static void test_wic_bitmap_format(void) release_test_context(&ctx); } -static void test_math(void) +static void test_math(BOOL d3d11) { float s, c, t, l; unsigned int i; @@ -9352,8 +9492,8 @@ START_TEST(d2d1) queue_test(test_linear_brush); queue_test(test_radial_brush); queue_test(test_path_geometry); - queue_test(test_rectangle_geometry); - queue_test(test_rounded_rectangle_geometry); + queue_d3d10_test(test_rectangle_geometry); + queue_d3d10_test(test_rounded_rectangle_geometry); queue_test(test_bitmap_formats); queue_test(test_alpha_mode); queue_test(test_shared_bitmap); @@ -9364,8 +9504,8 @@ START_TEST(d2d1) queue_test(test_dc_target); queue_test(test_hwnd_target); queue_test(test_bitmap_target); - queue_test(test_desktop_dpi); - queue_test(test_stroke_style); + queue_d3d10_test(test_desktop_dpi); + queue_d3d10_test(test_stroke_style); queue_test(test_gradient); queue_test(test_draw_geometry); queue_test(test_fill_geometry); @@ -9375,13 +9515,13 @@ START_TEST(d2d1) queue_test(test_create_device); queue_test(test_bitmap_surface); queue_test(test_device_context); - queue_test(test_invert_matrix); - queue_test(test_skew_matrix); + queue_d3d10_test(test_invert_matrix); + queue_d3d10_test(test_skew_matrix); queue_test(test_command_list); - queue_test(test_max_bitmap_size); + queue_d3d10_test(test_max_bitmap_size); queue_test(test_dpi); queue_test(test_wic_bitmap_format); - queue_test(test_math); + queue_d3d10_test(test_math); run_queued_tests(); } -- 2.20.1

2 1

[PATCH 11/12] d2d1/tests: Store an IDXGIDevice interface instead of an ID3D10Device1 interface in struct d2d1_test_context.
by Henri Verbeet Jan. 15, 2021

Jan. 15, 2021

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v3: - QueryInterface() returns a NULL interface on failure; it's also not supposed to fail. - Get rid of superfluous DXGI device reference counting. dlls/d2d1/tests/d2d1.c | 87 +++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 6f8aac4fd04..d38cd5649a6 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -44,7 +44,7 @@ size_t mt_tests_size, mt_test_count; struct d2d1_test_context { - ID3D10Device1 *device; + IDXGIDevice *device; HWND window; IDXGISwapChain *swapchain; IDXGISurface *surface; @@ -694,7 +694,7 @@ static BOOL compare_figure(struct d2d1_test_context *ctx, unsigned int x, unsign return diff <= max_diff; } -static ID3D10Device1 *create_device(void) +static ID3D10Device1 *create_d3d10_device(void) { ID3D10Device1 *device; @@ -711,6 +711,22 @@ static ID3D10Device1 *create_device(void) return NULL; } +static IDXGIDevice *create_device(void) +{ + ID3D10Device1 *d3d10_device; + IDXGIDevice *device; + HRESULT hr; + + if (!(d3d10_device = create_d3d10_device())) + return NULL; + + hr = ID3D10Device1_QueryInterface(d3d10_device, &IID_IDXGIDevice, (void **)&device); + ok(SUCCEEDED(hr), "Failed to get DXGI device, hr %#x.\n", hr); + ID3D10Device1_Release(d3d10_device); + + return device; +} + static HWND create_window(void) { RECT r = {0, 0, 640, 480}; @@ -721,20 +737,16 @@ static HWND create_window(void) 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL); } -static IDXGISwapChain *create_swapchain(ID3D10Device1 *device, HWND window, BOOL windowed) +static IDXGISwapChain *create_swapchain(IDXGIDevice *device, HWND window, BOOL windowed) { IDXGISwapChain *swapchain; DXGI_SWAP_CHAIN_DESC desc; - IDXGIDevice *dxgi_device; IDXGIAdapter *adapter; IDXGIFactory *factory; HRESULT hr; - hr = ID3D10Device1_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); - ok(SUCCEEDED(hr), "Failed to get DXGI device, hr %#x.\n", hr); - hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter); + hr = IDXGIDevice_GetAdapter(device, &adapter); ok(SUCCEEDED(hr), "Failed to get adapter, hr %#x.\n", hr); - IDXGIDevice_Release(dxgi_device); hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); ok(SUCCEEDED(hr), "Failed to get factory, hr %#x.\n", hr); IDXGIAdapter_Release(adapter); @@ -762,6 +774,19 @@ static IDXGISwapChain *create_swapchain(ID3D10Device1 *device, HWND window, BOOL return swapchain; } +static IDXGISwapChain *create_d3d10_swapchain(ID3D10Device1 *device, HWND window, BOOL windowed) +{ + IDXGISwapChain *swapchain; + IDXGIDevice *dxgi_device; + HRESULT hr; + + hr = ID3D10Device1_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to get DXGI device, hr %#x.\n", hr); + swapchain = create_swapchain(dxgi_device, window, windowed); + IDXGIDevice_Release(dxgi_device); + return swapchain; +} + static ID2D1RenderTarget *create_render_target_desc(IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc) { ID2D1RenderTarget *render_target; @@ -806,7 +831,7 @@ static void release_test_context_(unsigned int line, struct d2d1_test_context *c IDXGISurface_Release(ctx->surface); IDXGISwapChain_Release(ctx->swapchain); DestroyWindow(ctx->window); - ID3D10Device1_Release(ctx->device); + IDXGIDevice_Release(ctx->device); } #define init_test_context(ctx) init_test_context_(__LINE__, ctx) @@ -4256,7 +4281,7 @@ static void test_shared_bitmap(void) IDXGISwapChain *swapchain2; D2D1_SIZE_U size = {4, 4}; IDXGISurface1 *surface3; - ID3D10Device1 *device2; + IDXGIDevice *device2; HWND window2; HRESULT hr; @@ -4480,7 +4505,7 @@ static void test_shared_bitmap(void) IWICBitmap_Release(wic_bitmap1); IDXGISurface_Release(surface2); IDXGISwapChain_Release(swapchain2); - ID3D10Device1_Release(device2); + IDXGIDevice_Release(device2); release_test_context(&ctx); DestroyWindow(window2); CoUninitialize(); @@ -7792,7 +7817,6 @@ static void test_create_device(void) { D2D1_CREATION_PROPERTIES properties = {0}; struct d2d1_test_context ctx; - IDXGIDevice *dxgi_device; ID2D1Factory1 *factory; ID2D1Factory *factory2; ID2D1Device *device; @@ -7809,10 +7833,7 @@ static void test_create_device(void) return; } - hr = ID3D10Device1_QueryInterface(ctx.device, &IID_IDXGIDevice, (void **)&dxgi_device); - ok(SUCCEEDED(hr), "Failed to get IDXGIDevice interface, hr %#x.\n", hr); - - hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, &device); + hr = ID2D1Factory1_CreateDevice(factory, ctx.device, &device); ok(SUCCEEDED(hr), "Failed to get ID2D1Device, hr %#x.\n", hr); ID2D1Device_GetFactory(device, &factory2); @@ -7822,18 +7843,17 @@ static void test_create_device(void) if (pD2D1CreateDevice) { - hr = pD2D1CreateDevice(dxgi_device, NULL, &device); + hr = pD2D1CreateDevice(ctx.device, NULL, &device); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ID2D1Device_Release(device); - hr = pD2D1CreateDevice(dxgi_device, &properties, &device); + hr = pD2D1CreateDevice(ctx.device, &properties, &device); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ID2D1Device_Release(device); } else win_skip("D2D1CreateDevice() is unavailable.\n"); - IDXGIDevice_Release(dxgi_device); release_test_context(&ctx); refcount = ID2D1Factory1_Release(factory); @@ -8062,7 +8082,6 @@ static void test_bitmap_surface(void) IDXGISurface *surface2; D2D1_PIXEL_FORMAT pixel_format; struct d2d1_test_context ctx; - IDXGIDevice *dxgi_device; ID2D1Factory1 *factory; ID2D1RenderTarget *rt; ID2D1Bitmap1 *bitmap; @@ -8101,10 +8120,7 @@ static void test_bitmap_surface(void) ID2D1DeviceContext_Release(device_context); /* Bitmap created from DXGI surface. */ - hr = ID3D10Device1_QueryInterface(ctx.device, &IID_IDXGIDevice, (void **)&dxgi_device); - ok(SUCCEEDED(hr), "Failed to get IDXGIDevice interface, hr %#x.\n", hr); - - hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, &device); + hr = ID2D1Factory1_CreateDevice(factory, ctx.device, &device); ok(SUCCEEDED(hr), "Failed to get ID2D1Device, hr %#x.\n", hr); hr = ID2D1Device_CreateDeviceContext(device, D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &device_context); @@ -8134,10 +8150,7 @@ static void test_bitmap_surface(void) } /* A8 surface */ - hr = IDXGISurface_GetDevice(ctx.surface, &IID_IDXGIDevice, (void **)&dxgi_device); - ok(SUCCEEDED(hr), "Failed to get the device, hr %#x.\n", hr); - - surface2 = create_surface(dxgi_device, DXGI_FORMAT_A8_UNORM); + surface2 = create_surface(ctx.device, DXGI_FORMAT_A8_UNORM); hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(device_context, surface2, NULL, &bitmap); ok(SUCCEEDED(hr) || broken(hr == WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT) /* Win7 */, @@ -8152,7 +8165,6 @@ static void test_bitmap_surface(void) ID2D1Bitmap1_Release(bitmap); } - IDXGIDevice_Release(dxgi_device); IDXGISurface_Release(surface2); hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(device_context, ctx.surface, NULL, &bitmap); @@ -8212,7 +8224,6 @@ static void test_bitmap_surface(void) ID2D1DeviceContext_Release(device_context); ID2D1Device_Release(device); - IDXGIDevice_Release(dxgi_device); /* DC target */ rt_desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT; @@ -8282,7 +8293,6 @@ static void test_device_context(void) struct d2d1_test_context ctx; D2D1_BITMAP_OPTIONS options; ID2D1DCRenderTarget *dc_rt; - IDXGIDevice *dxgi_device; D2D1_UNIT_MODE unit_mode; ID2D1Factory1 *factory; ID2D1RenderTarget *rt; @@ -8305,12 +8315,8 @@ static void test_device_context(void) return; } - hr = ID3D10Device1_QueryInterface(ctx.device, &IID_IDXGIDevice, (void **)&dxgi_device); - ok(SUCCEEDED(hr), "Failed to get IDXGIDevice interface, hr %#x.\n", hr); - - hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, &device); + hr = ID2D1Factory1_CreateDevice(factory, ctx.device, &device); ok(SUCCEEDED(hr), "Failed to get ID2D1Device, hr %#x.\n", hr); - IDXGIDevice_Release(dxgi_device); hr = ID2D1Device_CreateDeviceContext(device, D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &device_context); ok(SUCCEEDED(hr), "Failed to create device context, hr %#x.\n", hr); @@ -8585,19 +8591,14 @@ static void test_skew_matrix(void) } } -static ID2D1DeviceContext *create_device_context(ID2D1Factory1 *factory, ID3D10Device1 *d3d_device) +static ID2D1DeviceContext *create_device_context(ID2D1Factory1 *factory, IDXGIDevice *dxgi_device) { ID2D1DeviceContext *device_context; - IDXGIDevice *dxgi_device; ID2D1Device *device; HRESULT hr; - hr = ID3D10Device1_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device); - ok(SUCCEEDED(hr), "Failed to get IDXGIDevice interface, hr %#x.\n", hr); - hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, &device); ok(SUCCEEDED(hr), "Failed to get ID2D1Device, hr %#x.\n", hr); - IDXGIDevice_Release(dxgi_device); hr = ID2D1Device_CreateDeviceContext(device, D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &device_context); ok(SUCCEEDED(hr), "Failed to create device context, hr %#x.\n", hr); @@ -8905,7 +8906,7 @@ static void test_max_bitmap_size(void) } window = create_window(); - swapchain = create_swapchain(device, window, TRUE); + swapchain = create_d3d10_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); -- 2.20.1

2 1

[PATCH 10/12] d2d1/tests: Pass a d2d1_test_context structure get_surface_readback().
by Henri Verbeet Jan. 15, 2021

Jan. 15, 2021

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v3: - Do not pass context to release_resource_readback(). dlls/d2d1/tests/d2d1.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 38fe6c4ff7d..6f8aac4fd04 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -311,8 +311,9 @@ static void cubic_to(ID2D1GeometrySink *sink, float x1, float y1, float x2, floa ID2D1GeometrySink_AddBezier(sink, &b); } -static void get_surface_readback(IDXGISurface *surface, struct resource_readback *rb) +static void get_surface_readback(struct d2d1_test_context *ctx, struct resource_readback *rb) { + IDXGISurface *surface = ctx->surface; D3D10_TEXTURE2D_DESC texture_desc; D3D10_MAPPED_TEXTURE2D map_desc; DXGI_SURFACE_DESC surface_desc; @@ -466,7 +467,7 @@ static BOOL compare_surface(struct d2d1_test_context *ctx, const char *ref_sha1) struct resource_readback rb; BOOL ret; - get_surface_readback(ctx->surface, &rb); + get_surface_readback(ctx, &rb); ret = compare_sha1(rb.data, rb.pitch, 4, rb.width, rb.height, ref_sha1); release_resource_readback(&rb); @@ -638,7 +639,7 @@ static BOOL compare_figure(struct d2d1_test_context *ctx, unsigned int x, unsign unsigned int i, j, span, diff; struct resource_readback rb; - get_surface_readback(ctx->surface, &rb); + get_surface_readback(ctx, &rb); figure.span_count = 0; figure.spans_size = 64; @@ -2170,7 +2171,7 @@ static void test_linear_brush(void) hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); - get_surface_readback(ctx.surface, &rb); + get_surface_readback(&ctx, &rb); for (i = 0; i < ARRAY_SIZE(test1); ++i) { DWORD colour; @@ -2243,7 +2244,7 @@ static void test_linear_brush(void) hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); - get_surface_readback(ctx.surface, &rb); + get_surface_readback(&ctx, &rb); for (i = 0; i < ARRAY_SIZE(test2); ++i) { DWORD colour; @@ -2367,7 +2368,7 @@ static void test_radial_brush(void) hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); - get_surface_readback(ctx.surface, &rb); + get_surface_readback(&ctx, &rb); for (i = 0; i < ARRAY_SIZE(test1); ++i) { DWORD colour; @@ -2442,7 +2443,7 @@ static void test_radial_brush(void) hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); - get_surface_readback(ctx.surface, &rb); + get_surface_readback(&ctx, &rb); for (i = 0; i < ARRAY_SIZE(test2); ++i) { DWORD colour; -- 2.20.1

2 1