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

[PATCH 1/5] wined3d: Correctly destroy the adapter on format initialization failure in no3d mode.
by Matteo Bruni 17 Jul '20

17 Jul '20

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1f892a9d48e8..b0cb6ad88a3a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2990,7 +2990,7 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal, if (!wined3d_adapter_no3d_init_format_info(adapter)) { - heap_free(adapter); + adapter_no3d_destroy(adapter); return NULL; } -- 2.26.2

3 8

[PATCH v2 1/2] dxgi: Implement IDXGIOutput5 and IDXGIOutput6 stubs.
by Rémi Bernon 17 Jul '20

17 Jul '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dxgi/adapter.c | 2 +- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/output.c | 166 ++++++++++++++++++++++++++++----------- 3 files changed, 123 insertions(+), 47 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index ad4e4b13057..72f1a2df6b1 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -145,7 +145,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac return hr; } - *output = (IDXGIOutput *)&output_object->IDXGIOutput4_iface; + *output = (IDXGIOutput *)&output_object->IDXGIOutput6_iface; TRACE("Returning output %p.\n", *output); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index a125a7667d9..e43ee59461c 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -144,7 +144,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l /* IDXGIOutput */ struct dxgi_output { - IDXGIOutput4 IDXGIOutput4_iface; + IDXGIOutput6 IDXGIOutput6_iface; LONG refcount; struct wined3d_output *wined3d_output; struct wined3d_private_store private_store; diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 5d31a0093cb..03b5384f326 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -181,18 +181,20 @@ static HRESULT dxgi_output_get_display_mode_list(struct dxgi_output *output, return S_OK; } -static inline struct dxgi_output *impl_from_IDXGIOutput4(IDXGIOutput4 *iface) +static inline struct dxgi_output *impl_from_IDXGIOutput6(IDXGIOutput6 *iface) { - return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput4_iface); + return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput6_iface); } /* IUnknown methods */ -static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput4 *iface, REFIID iid, void **object) +static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput6 *iface, REFIID iid, void **object) { TRACE("iface %p, iid %s, object %p.\n", iface, debugstr_guid(iid), object); - if (IsEqualGUID(iid, &IID_IDXGIOutput4) + if (IsEqualGUID(iid, &IID_IDXGIOutput6) + || IsEqualGUID(iid, &IID_IDXGIOutput5) + || IsEqualGUID(iid, &IID_IDXGIOutput4) || IsEqualGUID(iid, &IID_IDXGIOutput3) || IsEqualGUID(iid, &IID_IDXGIOutput2) || IsEqualGUID(iid, &IID_IDXGIOutput1) @@ -211,9 +213,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput4 *iface, return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE dxgi_output_AddRef(IDXGIOutput4 *iface) +static ULONG STDMETHODCALLTYPE dxgi_output_AddRef(IDXGIOutput6 *iface) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); ULONG refcount = InterlockedIncrement(&output->refcount); TRACE("%p increasing refcount to %u.\n", output, refcount); @@ -221,9 +223,9 @@ static ULONG STDMETHODCALLTYPE dxgi_output_AddRef(IDXGIOutput4 *iface) return refcount; } -static ULONG STDMETHODCALLTYPE dxgi_output_Release(IDXGIOutput4 *iface) +static ULONG STDMETHODCALLTYPE dxgi_output_Release(IDXGIOutput6 *iface) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); ULONG refcount = InterlockedDecrement(&output->refcount); TRACE("%p decreasing refcount to %u.\n", output, refcount); @@ -240,40 +242,40 @@ static ULONG STDMETHODCALLTYPE dxgi_output_Release(IDXGIOutput4 *iface) /* IDXGIObject methods */ -static HRESULT STDMETHODCALLTYPE dxgi_output_SetPrivateData(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_SetPrivateData(IDXGIOutput6 *iface, REFGUID guid, UINT data_size, const void *data) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); return dxgi_set_private_data(&output->private_store, guid, data_size, data); } -static HRESULT STDMETHODCALLTYPE dxgi_output_SetPrivateDataInterface(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_SetPrivateDataInterface(IDXGIOutput6 *iface, REFGUID guid, const IUnknown *object) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); TRACE("iface %p, guid %s, object %p.\n", iface, debugstr_guid(guid), object); return dxgi_set_private_data_interface(&output->private_store, guid, object); } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetPrivateData(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_GetPrivateData(IDXGIOutput6 *iface, REFGUID guid, UINT *data_size, void *data) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); return dxgi_get_private_data(&output->private_store, guid, data_size, data); } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetParent(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_GetParent(IDXGIOutput6 *iface, REFIID riid, void **parent) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); @@ -282,9 +284,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetParent(IDXGIOutput4 *iface, /* IDXGIOutput methods */ -static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput4 *iface, DXGI_OUTPUT_DESC *desc) +static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput6 *iface, DXGI_OUTPUT_DESC *desc) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); struct wined3d_output_desc wined3d_desc; HRESULT hr; @@ -312,10 +314,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput4 *iface, DXGI_O return S_OK; } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput6 *iface, DXGI_FORMAT format, UINT flags, UINT *mode_count, DXGI_MODE_DESC *modes) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); FIXME("iface %p, format %s, flags %#x, mode_count %p, modes %p partial stub!\n", iface, debug_dxgi_format(format), flags, mode_count, modes); @@ -324,10 +326,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput4 *if format, mode_count, modes, DXGI_MODE_STRUCT_VERSION_0); } -static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode(IDXGIOutput6 *iface, const DXGI_MODE_DESC *mode, DXGI_MODE_DESC *closest_match, IUnknown *device) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); struct wined3d_display_mode wined3d_mode; HRESULT hr; @@ -347,7 +349,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode(IDXGIOutput return hr; } -static HRESULT STDMETHODCALLTYPE dxgi_output_WaitForVBlank(IDXGIOutput4 *iface) +static HRESULT STDMETHODCALLTYPE dxgi_output_WaitForVBlank(IDXGIOutput6 *iface) { static BOOL once = FALSE; @@ -359,9 +361,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_WaitForVBlank(IDXGIOutput4 *iface) return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_output_TakeOwnership(IDXGIOutput4 *iface, IUnknown *device, BOOL exclusive) +static HRESULT STDMETHODCALLTYPE dxgi_output_TakeOwnership(IDXGIOutput6 *iface, IUnknown *device, BOOL exclusive) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); HRESULT hr; TRACE("iface %p, device %p, exclusive %d.\n", iface, device, exclusive); @@ -376,9 +378,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_TakeOwnership(IDXGIOutput4 *iface, return hr; } -static void STDMETHODCALLTYPE dxgi_output_ReleaseOwnership(IDXGIOutput4 *iface) +static void STDMETHODCALLTYPE dxgi_output_ReleaseOwnership(IDXGIOutput6 *iface) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); TRACE("iface %p.\n", iface); @@ -387,7 +389,7 @@ static void STDMETHODCALLTYPE dxgi_output_ReleaseOwnership(IDXGIOutput4 *iface) wined3d_mutex_unlock(); } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControlCapabilities(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControlCapabilities(IDXGIOutput6 *iface, DXGI_GAMMA_CONTROL_CAPABILITIES *gamma_caps) { unsigned int i; @@ -408,7 +410,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControlCapabilities(IDXGIOu return S_OK; } -static HRESULT STDMETHODCALLTYPE dxgi_output_SetGammaControl(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_SetGammaControl(IDXGIOutput6 *iface, const DXGI_GAMMA_CONTROL *gamma_control) { FIXME("iface %p, gamma_control %p stub!\n", iface, gamma_control); @@ -416,7 +418,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_SetGammaControl(IDXGIOutput4 *iface return S_OK; } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControl(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControl(IDXGIOutput6 *iface, DXGI_GAMMA_CONTROL *gamma_control) { FIXME("iface %p, gamma_control %p stub!\n", iface, gamma_control); @@ -424,21 +426,21 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControl(IDXGIOutput4 *iface return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_output_SetDisplaySurface(IDXGIOutput4 *iface, IDXGISurface *surface) +static HRESULT STDMETHODCALLTYPE dxgi_output_SetDisplaySurface(IDXGIOutput6 *iface, IDXGISurface *surface) { FIXME("iface %p, surface %p stub!\n", iface, surface); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplaySurfaceData(IDXGIOutput4 *iface, IDXGISurface *surface) +static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplaySurfaceData(IDXGIOutput6 *iface, IDXGISurface *surface) { FIXME("iface %p, surface %p stub!\n", iface, surface); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetFrameStatistics(IDXGIOutput4 *iface, DXGI_FRAME_STATISTICS *stats) +static HRESULT STDMETHODCALLTYPE dxgi_output_GetFrameStatistics(IDXGIOutput6 *iface, DXGI_FRAME_STATISTICS *stats) { FIXME("iface %p, stats %p stub!\n", iface, stats); @@ -447,10 +449,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetFrameStatistics(IDXGIOutput4 *if /* IDXGIOutput1 methods */ -static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList1(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList1(IDXGIOutput6 *iface, DXGI_FORMAT format, UINT flags, UINT *mode_count, DXGI_MODE_DESC1 *modes) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); FIXME("iface %p, format %s, flags %#x, mode_count %p, modes %p partial stub!\n", iface, debug_dxgi_format(format), flags, mode_count, modes); @@ -459,10 +461,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList1(IDXGIOutput4 *i format, mode_count, modes, DXGI_MODE_STRUCT_VERSION_1); } -static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode1(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode1(IDXGIOutput6 *iface, const DXGI_MODE_DESC1 *mode, DXGI_MODE_DESC1 *closest_match, IUnknown *device) { - struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); struct wined3d_display_mode wined3d_mode; HRESULT hr; @@ -482,7 +484,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode1(IDXGIOutpu return hr; } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplaySurfaceData1(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplaySurfaceData1(IDXGIOutput6 *iface, IDXGIResource *resource) { FIXME("iface %p, resource %p stub!\n", iface, resource); @@ -490,7 +492,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplaySurfaceData1(IDXGIOutput4 return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_output_DuplicateOutput(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_DuplicateOutput(IDXGIOutput6 *iface, IUnknown *device, IDXGIOutputDuplication **output_duplication) { FIXME("iface %p, device %p, output_duplication %p stub!\n", iface, device, output_duplication); @@ -500,7 +502,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_DuplicateOutput(IDXGIOutput4 *iface /* IDXGIOutput2 methods */ -static BOOL STDMETHODCALLTYPE dxgi_output_SupportsOverlays(IDXGIOutput4 *iface) +static BOOL STDMETHODCALLTYPE dxgi_output_SupportsOverlays(IDXGIOutput6 *iface) { FIXME("iface %p stub!\n", iface); @@ -509,7 +511,7 @@ static BOOL STDMETHODCALLTYPE dxgi_output_SupportsOverlays(IDXGIOutput4 *iface) /* IDXGIOutput3 methods */ -static HRESULT STDMETHODCALLTYPE dxgi_output_CheckOverlaySupport(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_CheckOverlaySupport(IDXGIOutput6 *iface, DXGI_FORMAT format, IUnknown *device, UINT *flags) { FIXME("iface %p, format %#x, device %p, flags %p stub!\n", iface, format, device, flags); @@ -519,7 +521,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_CheckOverlaySupport(IDXGIOutput4 *i /* IDXGIOutput4 methods */ -static HRESULT STDMETHODCALLTYPE dxgi_output_CheckOverlayColorSpaceSupport(IDXGIOutput4 *iface, +static HRESULT STDMETHODCALLTYPE dxgi_output_CheckOverlayColorSpaceSupport(IDXGIOutput6 *iface, DXGI_FORMAT format, DXGI_COLOR_SPACE_TYPE color_space, IUnknown *device, UINT *flags) { FIXME("iface %p, format %#x, color_space %#x, device %p, flags %p stub!\n", @@ -528,7 +530,76 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_CheckOverlayColorSpaceSupport(IDXGI return E_NOTIMPL; } -static const struct IDXGIOutput4Vtbl dxgi_output_vtbl = +/* IDXGIOutput5 methods */ + +static HRESULT STDMETHODCALLTYPE dxgi_output_DuplicateOutput1(IDXGIOutput6 *iface, + IUnknown *device, UINT flags, UINT format_count, const DXGI_FORMAT *formats, + IDXGIOutputDuplication **output_duplication) +{ + FIXME("iface %p, device %p, flags %#x, format_count %u, formats %p, " + "output_duplication %p stub!\n", iface, device, flags, format_count, + formats, output_duplication); + + return E_NOTIMPL; +} + +/* IDXGIOutput6 methods */ + +static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc1(IDXGIOutput6 *iface, + DXGI_OUTPUT_DESC1 *desc) +{ + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); + struct wined3d_output_desc wined3d_desc; + HRESULT hr; + + FIXME("iface %p, desc %p semi-stub!\n", iface, desc); + + if (!desc) + return E_INVALIDARG; + + wined3d_mutex_lock(); + hr = wined3d_output_get_desc(output->wined3d_output, &wined3d_desc); + wined3d_mutex_unlock(); + + if (FAILED(hr)) + { + WARN("Failed to get output desc, hr %#x.\n", hr); + return hr; + } + + memcpy(desc->DeviceName, wined3d_desc.device_name, sizeof(desc->DeviceName)); + desc->DesktopCoordinates = wined3d_desc.desktop_rect; + desc->AttachedToDesktop = wined3d_desc.attached_to_desktop; + desc->Rotation = wined3d_desc.rotation; + desc->Monitor = wined3d_desc.monitor; + + /* FIXME: fill this from monitor EDID */ + desc->BitsPerColor = 0; + desc->ColorSpace = DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709; + desc->RedPrimary[0] = 0.f; + desc->RedPrimary[1] = 0.f; + desc->GreenPrimary[0] = 0.f; + desc->GreenPrimary[1] = 0.f; + desc->BluePrimary[0] = 0.f; + desc->BluePrimary[1] = 0.f; + desc->WhitePoint[0] = 0.f; + desc->WhitePoint[1] = 0.f; + desc->MinLuminance = 0.f; + desc->MaxLuminance = 0.f; + desc->MaxFullFrameLuminance = 0.f; + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE dxgi_output_CheckHardwareCompositionSupport(IDXGIOutput6 *iface, + UINT *flags) +{ + FIXME("iface %p, flags %p stub!\n", iface, flags); + + return E_NOTIMPL; +} + +static const struct IDXGIOutput6Vtbl dxgi_output_vtbl = { dxgi_output_QueryInterface, dxgi_output_AddRef, @@ -562,6 +633,11 @@ static const struct IDXGIOutput4Vtbl dxgi_output_vtbl = dxgi_output_CheckOverlaySupport, /* IDXGIOutput4 methods */ dxgi_output_CheckOverlayColorSpaceSupport, + /* IDXGIOutput5 methods */ + dxgi_output_DuplicateOutput1, + /* IDXGIOutput6 methods */ + dxgi_output_GetDesc1, + dxgi_output_CheckHardwareCompositionSupport, }; struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface) @@ -569,13 +645,13 @@ struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface) if (!iface) return NULL; assert(iface->lpVtbl == (IDXGIOutputVtbl *)&dxgi_output_vtbl); - return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput4_iface); + return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput6_iface); } static void dxgi_output_init(struct dxgi_output *output, unsigned int output_idx, struct dxgi_adapter *adapter) { - output->IDXGIOutput4_iface.lpVtbl = &dxgi_output_vtbl; + output->IDXGIOutput6_iface.lpVtbl = &dxgi_output_vtbl; output->refcount = 1; output->wined3d_output = wined3d_adapter_get_output(adapter->wined3d_adapter, output_idx); wined3d_private_store_init(&output->private_store); -- 2.27.0

3 5

[PATCH resend] tests: Trace elapsed time when $WINETEST_TIME is set.
by Francois Gouget 17 Jul '20

17 Jul '20

This simplifies narrowing down where a test gets stuck or is slow if it times out but prints few messages. Note that the elapsed time is relative to the current process start time. So subprocesses will have a different elapsed time. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48094 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v1: https://www.winehq.org/pipermail/wine-devel/2019-December/156041.html -> This was modifying the environment which caused some trouble. v2: https://www.winehq.org/pipermail/wine-devel/2019-December/157164.html -> Dropped attempting to use the same starting point for the elapsed time in each subprocess which eliminated the need for modifying the environment. But it was sent on the 30th of December which may have been a bad time because it fell into a black hole. Then there were other changes to make to test.h (to limit spam, handling of child processes) so this went to the back burner. So now I'm resubmitting v2. Let me know if it needs further changes. Once/if committed I'll patch the TestBot to add a 'Trace timing information' checkbox and parse the corresponding logs. include/wine/test.h | 75 +++++++++++++++++++++++++++++---------------- 1 file changed, 49 insertions(+), 26 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 84ac1e516bf..869d8f8e33b 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -47,6 +47,9 @@ /* debug level */ extern int winetest_debug; +/* trace timing information */ +extern int winetest_time; + /* running in interactive mode? */ extern int winetest_interactive; @@ -199,6 +202,10 @@ extern const struct test winetest_testlist[]; /* debug level */ int winetest_debug = 1; +/* trace timing information */ +int winetest_time = 0; +DWORD winetest_start_time, winetest_last_time; + /* interactive mode? */ int winetest_interactive = 0; @@ -278,11 +285,20 @@ void winetest_set_location( const char* file, int line ) data->current_line=line; } +const char *winetest_elapsed(void) +{ + DWORD now; + + if (!winetest_time) return ""; + winetest_last_time = now = GetTickCount(); + return wine_dbg_sprintf( "%.3f", (now - winetest_start_time) / 1000.0); +} + void winetest_subtest( const char* name ) { struct tls_data *data = get_tls_data(); - printf( "%s:%d: Subtest %s\n", - data->current_file, data->current_line, name); + printf( "%s:%d:%s Subtest %s\n", + data->current_file, data->current_line, winetest_elapsed(), name ); } int broken( int condition ) @@ -302,9 +318,9 @@ static LONG winetest_add_line( void ) index = data->current_line % ARRAY_SIZE(line_counters); count = InterlockedIncrement(line_counters + index) - 1; if (count == winetest_mute_threshold) - printf( "%s:%d Line has been silenced after %d occurrences\n", - data->current_file, data->current_line, - winetest_mute_threshold); + printf( "%s:%d:%s Line has been silenced after %d occurrences\n", + data->current_file, data->current_line, winetest_elapsed(), + winetest_mute_threshold ); return count; } @@ -327,8 +343,8 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (condition) { - printf( "%s:%d: Test succeeded inside todo block: ", - data->current_file, data->current_line ); + printf( "%s:%d:%s Test succeeded inside todo block: ", + data->current_file, data->current_line, winetest_elapsed() ); vprintf(msg, args); InterlockedIncrement(&todo_failures); return 0; @@ -340,8 +356,8 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (winetest_debug > 0) { - printf( "%s:%d: Test marked todo: ", - data->current_file, data->current_line ); + printf( "%s:%d:%s Test marked todo: ", + data->current_file, data->current_line, winetest_elapsed() ); vprintf(msg, args); } InterlockedIncrement(&todo_successes); @@ -355,17 +371,20 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (!condition) { - printf( "%s:%d: Test failed: ", - data->current_file, data->current_line ); + printf( "%s:%d:%s Test failed: ", + data->current_file, data->current_line, winetest_elapsed() ); vprintf(msg, args); InterlockedIncrement(&failures); return 0; } else { - if (winetest_report_success) - printf( "%s:%d: Test succeeded\n", - data->current_file, data->current_line); + if (winetest_report_success || + (winetest_time && GetTickCount() >= winetest_last_time + 1000)) + { + printf( "%s:%d:%s Test succeeded\n", + data->current_file, data->current_line, winetest_elapsed() ); + } InterlockedIncrement(&successes); return 1; } @@ -390,7 +409,7 @@ void __winetest_cdecl winetest_trace( const char *msg, ... ) if (winetest_add_line() < winetest_mute_threshold) { struct tls_data *data = get_tls_data(); - printf( "%s:%d: ", data->current_file, data->current_line ); + printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed() ); __winetest_va_start(valist, msg); vprintf(msg, valist); __winetest_va_end(valist); @@ -404,7 +423,7 @@ void winetest_vskip( const char *msg, __winetest_va_list args ) if (winetest_add_line() < winetest_mute_threshold) { struct tls_data *data = get_tls_data(); - printf( "%s:%d: Tests skipped: ", data->current_file, data->current_line ); + printf( "%s:%d:%s Tests skipped: ", data->current_file, data->current_line, winetest_elapsed() ); vprintf(msg, args); InterlockedIncrement(&skipped); } @@ -490,14 +509,16 @@ void winetest_wait_child_process( HANDLE process ) if (exit_code > 255) { DWORD pid = GetProcessId( process ); - printf( "%s:%d: unhandled exception %08x in child process %04x\n", - current_test->name, data->current_line, exit_code, pid ); + printf( "%s:%d:%s unhandled exception %08x in child process %04x\n", + current_test->name, data->current_line, winetest_elapsed(), + exit_code, pid ); InterlockedIncrement( &failures ); } else if (exit_code) { - printf( "%s:%d: %u failures in child process\n", - current_test->name, data->current_line, exit_code ); + printf( "%s:%d:%s %u failures in child process\n", + current_test->name, data->current_line, winetest_elapsed(), + exit_code ); while (exit_code-- > 0) InterlockedIncrement(&failures); } @@ -553,11 +574,11 @@ static int run_test( const char *name ) if (winetest_debug) { if (muted_todo_successes || muted_skipped || muted_traces) - printf( "%04x:%s: Silenced %d todos, %d skips and %d traces.\n", - GetCurrentProcessId(), test->name, + printf( "%04x:%s:%s Silenced %d todos, %d skips and %d traces.\n", + GetCurrentProcessId(), test->name, winetest_elapsed(), muted_todo_successes, muted_skipped, muted_traces); - printf( "%04x:%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", - GetCurrentProcessId(), test->name, + printf( "%04x:%s:%s %d tests executed (%d marked as todo, %d %s), %d skipped.\n", + GetCurrentProcessId(), test->name, winetest_elapsed(), successes + failures + todo_successes + todo_failures, todo_successes, failures + todo_failures, (failures + todo_failures != 1) ? "failures" : "failure", @@ -584,8 +605,8 @@ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) if (data->current_file) printf( "%s:%d: this is the last test seen before the exception\n", data->current_file, data->current_line ); - printf( "%04x:%s: unhandled exception %08x at %p\n", - GetCurrentProcessId(), current_test->name, + printf( "%04x:%s:%s unhandled exception %08x at %p\n", + GetCurrentProcessId(), current_test->name, winetest_elapsed(), ptrs->ExceptionRecord->ExceptionCode, ptrs->ExceptionRecord->ExceptionAddress ); fflush( stdout ); return EXCEPTION_EXECUTE_HANDLER; @@ -621,6 +642,8 @@ int main( int argc, char **argv ) if (GetEnvironmentVariableA( "WINETEST_DEBUG", p, sizeof(p) )) winetest_debug = atoi(p); if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) winetest_report_success = atoi(p); + if (GetEnvironmentVariableA( "WINETEST_TIME", p, sizeof(p) )) winetest_time = atoi(p); + winetest_last_time = winetest_start_time = GetTickCount(); if (!strcmp( winetest_platform, "windows" )) SetUnhandledExceptionFilter( exc_filter ); if (!winetest_interactive) SetErrorMode( SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX ); -- 2.20.1

1 0

[PATCH] kernel32: FILE_SetDosError() is not used anymore so remove it.
by Francois Gouget 17 Jul '20

17 Jul '20

The last user, RemoveDirectoryA/W(), has been moved to kernelbase. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernel32/file.c | 67 ---------------------------------- dlls/kernel32/kernel_private.h | 1 - 2 files changed, 68 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 29dd5791af4..949be6c303d 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -92,73 +92,6 @@ static HANDLE create_file_OF( LPCSTR path, INT mode ) } -/*********************************************************************** - * FILE_SetDosError - * - * Set the DOS error code from errno. - */ -void FILE_SetDosError(void) -{ - int save_errno = errno; /* errno gets overwritten by printf */ - - TRACE("errno = %d %s\n", errno, strerror(errno)); - switch (save_errno) - { - case EAGAIN: - SetLastError( ERROR_SHARING_VIOLATION ); - break; - case EBADF: - SetLastError( ERROR_INVALID_HANDLE ); - break; - case ENOSPC: - SetLastError( ERROR_HANDLE_DISK_FULL ); - break; - case EACCES: - case EPERM: - case EROFS: - SetLastError( ERROR_ACCESS_DENIED ); - break; - case EBUSY: - SetLastError( ERROR_LOCK_VIOLATION ); - break; - case ENOENT: - SetLastError( ERROR_FILE_NOT_FOUND ); - break; - case EISDIR: - SetLastError( ERROR_CANNOT_MAKE ); - break; - case ENFILE: - case EMFILE: - SetLastError( ERROR_TOO_MANY_OPEN_FILES ); - break; - case EEXIST: - SetLastError( ERROR_FILE_EXISTS ); - break; - case EINVAL: - case ESPIPE: - SetLastError( ERROR_SEEK ); - break; - case ENOTEMPTY: - SetLastError( ERROR_DIR_NOT_EMPTY ); - break; - case ENOEXEC: - SetLastError( ERROR_BAD_FORMAT ); - break; - case ENOTDIR: - SetLastError( ERROR_PATH_NOT_FOUND ); - break; - case EXDEV: - SetLastError( ERROR_NOT_SAME_DEVICE ); - break; - default: - WARN("unknown file error: %s\n", strerror(save_errno) ); - SetLastError( ERROR_GEN_FAILURE ); - break; - } - errno = save_errno; -} - - /*********************************************************************** * FILE_name_AtoW * diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index bcf2ee9a522..2a0e5247488 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -60,7 +60,6 @@ extern SYSTEM_BASIC_INFORMATION system_info DECLSPEC_HIDDEN; extern const WCHAR DIR_Windows[] DECLSPEC_HIDDEN; extern const WCHAR DIR_System[] DECLSPEC_HIDDEN; -extern void FILE_SetDosError(void) DECLSPEC_HIDDEN; 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; -- 2.20.1

1 0

[PATCH v2 1/2] qdvd: Add a stub dvd navigator filter.
by Gijs Vermeulen 17 Jul '20

17 Jul '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/qdvd/Makefile.in | 3 +- dlls/qdvd/navigator.c | 67 +++++++++++++ dlls/qdvd/qdvd_classes.idl | 7 ++ dlls/qdvd/qdvd_main.c | 3 + dlls/qdvd/qdvd_private.h | 1 + dlls/qdvd/tests/Makefile.in | 3 +- dlls/qdvd/tests/navigator.c | 191 ++++++++++++++++++++++++++++++++++++ 7 files changed, 273 insertions(+), 2 deletions(-) create mode 100644 dlls/qdvd/navigator.c create mode 100644 dlls/qdvd/tests/navigator.c diff --git a/dlls/qdvd/Makefile.in b/dlls/qdvd/Makefile.in index 8f5089b3ac..364a81e637 100644 --- a/dlls/qdvd/Makefile.in +++ b/dlls/qdvd/Makefile.in @@ -1,10 +1,11 @@ MODULE = qdvd.dll -IMPORTS = strmiids uuid ole32 +IMPORTS = strmbase strmiids uuid ole32 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ graph.c \ + navigator.c \ qdvd_main.c IDL_SRCS = \ diff --git a/dlls/qdvd/navigator.c b/dlls/qdvd/navigator.c new file mode 100644 index 0000000000..1e121dde60 --- /dev/null +++ b/dlls/qdvd/navigator.c @@ -0,0 +1,67 @@ +/* + * Navigator filter + * + * Copyright 2020 Gijs Vermeulen + * + * 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 + */ + +#include "qdvd_private.h" +#include "wine/strmbase.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qdvd); + +struct navigator +{ + struct strmbase_filter filter; +}; + +static inline struct navigator *impl_from_strmbase_filter(struct strmbase_filter *filter) +{ + return CONTAINING_RECORD(filter, struct navigator, filter); +} + +static struct strmbase_pin *navigator_get_pin(struct strmbase_filter *iface, unsigned int index) +{ + return NULL; +} + +static void navigator_destroy(struct strmbase_filter *iface) +{ + struct navigator *filter = impl_from_strmbase_filter(iface); + + strmbase_filter_cleanup(&filter->filter); + free(filter); +} + +static const struct strmbase_filter_ops filter_ops = +{ + .filter_get_pin = navigator_get_pin, + .filter_destroy = navigator_destroy, +}; + +HRESULT navigator_create(IUnknown *outer, IUnknown **out) +{ + struct navigator *object; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + strmbase_filter_init(&object->filter, outer, &CLSID_DVDNavigator, &filter_ops); + + TRACE("Created DVD Navigator filter %p.\n", object); + *out = &object->filter.IUnknown_inner; + return S_OK; +} diff --git a/dlls/qdvd/qdvd_classes.idl b/dlls/qdvd/qdvd_classes.idl index 7fd2a081ba..c55c7e3944 100644 --- a/dlls/qdvd/qdvd_classes.idl +++ b/dlls/qdvd/qdvd_classes.idl @@ -24,3 +24,10 @@ uuid(fcc152b7-f372-11d0-8e00-00c04fd7c08b), ] coclass DvdGraphBuilder {} + +[ + helpstring("DVD Navigator Filter"), + threading(both), + uuid(9b8c4620-2c1a-11d0-8493-00a02438ad48), +] +coclass DVDNavigator {} diff --git a/dlls/qdvd/qdvd_main.c b/dlls/qdvd/qdvd_main.c index c529533e44..2fdb108877 100644 --- a/dlls/qdvd/qdvd_main.c +++ b/dlls/qdvd/qdvd_main.c @@ -100,6 +100,7 @@ static const IClassFactoryVtbl class_factory_vtbl = }; static struct class_factory graph_builder_cf = {{&class_factory_vtbl}, graph_builder_create}; +static struct class_factory navigator_cf = {{&class_factory_vtbl}, navigator_create}; BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { @@ -120,6 +121,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) if (IsEqualGUID(clsid, &CLSID_DvdGraphBuilder)) return IClassFactory_QueryInterface(&graph_builder_cf.IClassFactory_iface, iid, out); + if (IsEqualGUID(clsid, &CLSID_DVDNavigator)) + return IClassFactory_QueryInterface(&navigator_cf.IClassFactory_iface, iid, out); FIXME("%s not available, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(clsid)); return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/qdvd/qdvd_private.h b/dlls/qdvd/qdvd_private.h index 297949ee60..48fced46f1 100644 --- a/dlls/qdvd/qdvd_private.h +++ b/dlls/qdvd/qdvd_private.h @@ -26,5 +26,6 @@ #include "wine/debug.h" HRESULT graph_builder_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT navigator_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; #endif /* QDVD_PRIVATE_H */ diff --git a/dlls/qdvd/tests/Makefile.in b/dlls/qdvd/tests/Makefile.in index 3e9efd9c74..57f8fbba5a 100644 --- a/dlls/qdvd/tests/Makefile.in +++ b/dlls/qdvd/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = qdvd.dll IMPORTS = strmiids uuid ole32 C_SRCS = \ - graph.c + graph.c \ + navigator.c diff --git a/dlls/qdvd/tests/navigator.c b/dlls/qdvd/tests/navigator.c new file mode 100644 index 0000000000..f01e428b4e --- /dev/null +++ b/dlls/qdvd/tests/navigator.c @@ -0,0 +1,191 @@ +/* + * Navigator filter unit tests + * + * Copyright 2020 Gijs Vermeulen + * + * 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 + */ + +#define COBJMACROS +#include "dshow.h" +#include "wine/strmbase.h" +#include "wine/test.h" + +static IBaseFilter *create_navigator(void) +{ + IBaseFilter *filter = NULL; + HRESULT hr = CoCreateInstance(&CLSID_DVDNavigator, NULL, + CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return filter; +} + +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IBaseFilter *filter = create_navigator(); + + check_interface(filter, &IID_IBaseFilter, TRUE); + todo_wine check_interface(filter, &IID_IDvdControl, TRUE); + todo_wine check_interface(filter, &IID_IDvdControl2, TRUE); + todo_wine check_interface(filter, &IID_IDvdInfo, TRUE); + todo_wine check_interface(filter, &IID_IDvdInfo2, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + todo_wine check_interface(filter, &IID_ISpecifyPropertyPages, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + + check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); + check_interface(filter, &IID_IBasicAudio, FALSE); + check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IFileSourceFilter, FALSE); + check_interface(filter, &IID_IKsPropertySet, FALSE); + check_interface(filter, &IID_IMediaPosition, FALSE); + check_interface(filter, &IID_IMediaSeeking, FALSE); + check_interface(filter, &IID_IPersistPropertyBag, FALSE); + check_interface(filter, &IID_IPersistStream, FALSE); + check_interface(filter, &IID_IPin, FALSE); + check_interface(filter, &IID_IQualityControl, FALSE); + check_interface(filter, &IID_IQualProp, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IVideoWindow, FALSE); + + IBaseFilter_Release(filter); +} + +static const GUID test_iid = {0x33333333}; +static LONG outer_ref = 1; + +static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID iid, void **out) +{ + if (IsEqualGUID(iid, &IID_IUnknown) + || IsEqualGUID(iid, &IID_IBaseFilter) + || IsEqualGUID(iid, &test_iid)) + { + *out = (IUnknown *)0xdeadbeef; + return S_OK; + } + ok(0, "unexpected call %s\n", wine_dbgstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef(IUnknown *iface) +{ + return InterlockedIncrement(&outer_ref); +} + +static ULONG WINAPI outer_Release(IUnknown *iface) +{ + return InterlockedDecrement(&outer_ref); +} + +static const IUnknownVtbl outer_vtbl = +{ + outer_QueryInterface, + outer_AddRef, + outer_Release, +}; + +static IUnknown test_outer = {&outer_vtbl}; + +static void test_aggregation(void) +{ + IBaseFilter *filter, *filter2; + IUnknown *unk, *unk2; + HRESULT hr; + ULONG ref; + + filter = (IBaseFilter *)0xdeadbeef; + hr = CoCreateInstance(&CLSID_DVDNavigator, &test_outer, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!filter, "Got interface %p.\n", filter); + + hr = CoCreateInstance(&CLSID_DVDNavigator, &test_outer, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); + ref = get_refcount(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + ref = IUnknown_AddRef(unk); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + ref = IUnknown_Release(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + hr = IUnknown_QueryInterface(unk, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == unk, "Got unexpected IUnknown %p.\n", unk2); + IUnknown_Release(unk2); + + hr = IUnknown_QueryInterface(unk, &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_QueryInterface(filter, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + hr = IBaseFilter_QueryInterface(filter, &IID_IBaseFilter, (void **)&filter2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(filter2 == (IBaseFilter *)0xdeadbeef, "Got unexpected IBaseFilter %p.\n", filter2); + + hr = IUnknown_QueryInterface(unk, &test_iid, (void **)&unk2); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!unk2, "Got unexpected IUnknown %p.\n", unk2); + + hr = IBaseFilter_QueryInterface(filter, &test_iid, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + IBaseFilter_Release(filter); + ref = IUnknown_Release(unk); + ok(!ref, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); +} + +START_TEST(navigator) +{ + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + test_interfaces(); + test_aggregation(); + + CoUninitialize(); +} -- 2.27.0

2 3

[PATCH vkd3d 5/5] vkd3d-shader: Rename the vkd3d_root_parameter structure to vkd3d_shader_root_parameter.
by Henri Verbeet 17 Jul '20

17 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 18 +++++++++--------- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index d55a18d..631cbf5 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -467,7 +467,7 @@ enum vkd3d_shader_root_parameter_type VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_ROOT_PARAMETER_TYPE), }; -struct vkd3d_root_parameter +struct vkd3d_shader_root_parameter { enum vkd3d_shader_root_parameter_type parameter_type; union @@ -496,7 +496,7 @@ enum vkd3d_root_signature_flags struct vkd3d_root_signature_desc { unsigned int parameter_count; - const struct vkd3d_root_parameter *parameters; + const struct vkd3d_shader_root_parameter *parameters; unsigned int static_sampler_count; const struct vkd3d_static_sampler_desc *static_samplers; enum vkd3d_root_signature_flags flags; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index e424aa6..303bedd 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2432,7 +2432,7 @@ static int shader_parse_root_descriptor1(struct root_signature_parser_context *c } static int shader_parse_root_parameters(struct root_signature_parser_context *context, - unsigned int offset, unsigned int count, struct vkd3d_root_parameter *parameters) + unsigned int offset, unsigned int count, struct vkd3d_shader_root_parameter *parameters) { const char *ptr; unsigned int i; @@ -2596,7 +2596,7 @@ static int shader_parse_root_signature(const char *data, unsigned int data_size, v_1_0->parameter_count = count; if (v_1_0->parameter_count) { - struct vkd3d_root_parameter *parameters; + struct vkd3d_shader_root_parameter *parameters; if (!(parameters = vkd3d_calloc(v_1_0->parameter_count, sizeof(*parameters)))) return VKD3D_ERROR_OUT_OF_MEMORY; v_1_0->parameters = parameters; @@ -3181,7 +3181,7 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_versioned_root_sign return VKD3D_OK; } -static void free_descriptor_ranges(const struct vkd3d_root_parameter *parameters, unsigned int count) +static void free_descriptor_ranges(const struct vkd3d_shader_root_parameter *parameters, unsigned int count) { unsigned int i; @@ -3190,14 +3190,14 @@ static void free_descriptor_ranges(const struct vkd3d_root_parameter *parameters for (i = 0; i < count; ++i) { - const struct vkd3d_root_parameter *p = &parameters[i]; + const struct vkd3d_shader_root_parameter *p = &parameters[i]; if (p->parameter_type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) vkd3d_free((void *)p->u.descriptor_table.descriptor_ranges); } } -static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, +static int convert_root_parameters_to_v_1_0(struct vkd3d_shader_root_parameter *dst, const struct vkd3d_root_parameter1 *src, unsigned int count) { const struct vkd3d_shader_descriptor_range1 *ranges1; @@ -3208,7 +3208,7 @@ static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, for (i = 0; i < count; ++i) { const struct vkd3d_root_parameter1 *p1 = &src[i]; - struct vkd3d_root_parameter *p = &dst[i]; + struct vkd3d_shader_root_parameter *p = &dst[i]; p->parameter_type = p1->parameter_type; switch (p->parameter_type) @@ -3264,8 +3264,8 @@ static int convert_root_signature_to_v1_0(struct vkd3d_versioned_root_signature_ { const struct vkd3d_root_signature_desc1 *src_desc = &src->u.v_1_1; struct vkd3d_root_signature_desc *dst_desc = &dst->u.v_1_0; + struct vkd3d_shader_root_parameter *parameters = NULL; struct vkd3d_static_sampler_desc *samplers = NULL; - struct vkd3d_root_parameter *parameters = NULL; int ret; if ((dst_desc->parameter_count = src_desc->parameter_count)) @@ -3317,7 +3317,7 @@ static void free_descriptor_ranges1(const struct vkd3d_root_parameter1 *paramete } static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, - const struct vkd3d_root_parameter *src, unsigned int count) + const struct vkd3d_shader_root_parameter *src, unsigned int count) { const struct vkd3d_shader_descriptor_range *ranges; struct vkd3d_shader_descriptor_range1 *ranges1; @@ -3326,7 +3326,7 @@ static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, for (i = 0; i < count; ++i) { - const struct vkd3d_root_parameter *p = &src[i]; + const struct vkd3d_shader_root_parameter *p = &src[i]; struct vkd3d_root_parameter1 *p1 = &dst[i]; p1->parameter_type = p->parameter_type; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index f7489f6..8dbd17e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -484,7 +484,7 @@ static void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_root_signature_d for (i = 0; i < root_signature->parameter_count; ++i) { - const struct vkd3d_root_parameter *parameter = &root_signature->parameters[i]; + const struct vkd3d_shader_root_parameter *parameter = &root_signature->parameters[i]; if (parameter->parameter_type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) vkd3d_free((void *)parameter->u.descriptor_table.descriptor_ranges); -- 2.11.0

1 0

[PATCH vkd3d 4/5] vkd3d-shader: Rename the vkd3d_root_descriptor1 structure to vkd3d_shader_root_descriptor1.
by Henri Verbeet 17 Jul '20

17 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 83def2d..d55a18d 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -540,7 +540,7 @@ struct vkd3d_shader_root_descriptor_table1 const struct vkd3d_shader_descriptor_range1 *descriptor_ranges; }; -struct vkd3d_root_descriptor1 +struct vkd3d_shader_root_descriptor1 { unsigned int shader_register; unsigned int register_space; @@ -554,7 +554,7 @@ struct vkd3d_root_parameter1 { struct vkd3d_shader_root_descriptor_table1 descriptor_table; struct vkd3d_shader_root_constants constants; - struct vkd3d_root_descriptor1 descriptor; + struct vkd3d_shader_root_descriptor1 descriptor; } u; enum vkd3d_shader_visibility shader_visibility; }; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 5df551b..e424aa6 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2396,7 +2396,7 @@ static int shader_parse_root_descriptor(struct root_signature_parser_context *co return VKD3D_OK; } -static void shader_validate_root_descriptor1(const struct vkd3d_root_descriptor1 *descriptor) +static void shader_validate_root_descriptor1(const struct vkd3d_shader_root_descriptor1 *descriptor) { unsigned int unknown_flags = descriptor->flags & ~(VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_NONE | VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE @@ -2408,7 +2408,7 @@ static void shader_validate_root_descriptor1(const struct vkd3d_root_descriptor1 } static int shader_parse_root_descriptor1(struct root_signature_parser_context *context, - unsigned int offset, struct vkd3d_root_descriptor1 *descriptor) + unsigned int offset, struct vkd3d_shader_root_descriptor1 *descriptor) { const char *ptr; @@ -2901,7 +2901,7 @@ static int shader_write_root_descriptor(struct root_signature_writer_context *co } static int shader_write_root_descriptor1(struct root_signature_writer_context *context, - const struct vkd3d_root_descriptor1 *descriptor) + const struct vkd3d_shader_root_descriptor1 *descriptor) { if (!write_dword(context, descriptor->shader_register)) return VKD3D_ERROR_OUT_OF_MEMORY; -- 2.11.0

1 0

[PATCH vkd3d 3/5] vkd3d-shader: Rename the vkd3d_root_descriptor_table1 structure to vkd3d_shader_root_descriptor_table1.
by Henri Verbeet 17 Jul '20

17 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index cbc4562..83def2d 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -534,7 +534,7 @@ struct vkd3d_shader_descriptor_range1 unsigned int descriptor_table_offset; }; -struct vkd3d_root_descriptor_table1 +struct vkd3d_shader_root_descriptor_table1 { unsigned int descriptor_range_count; const struct vkd3d_shader_descriptor_range1 *descriptor_ranges; @@ -552,7 +552,7 @@ struct vkd3d_root_parameter1 enum vkd3d_shader_root_parameter_type parameter_type; union { - struct vkd3d_root_descriptor_table1 descriptor_table; + struct vkd3d_shader_root_descriptor_table1 descriptor_table; struct vkd3d_shader_root_constants constants; struct vkd3d_root_descriptor1 descriptor; } u; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 4f19b85..5df551b 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2327,7 +2327,7 @@ static int shader_parse_descriptor_table(struct root_signature_parser_context *c } static int shader_parse_descriptor_table1(struct root_signature_parser_context *context, - unsigned int offset, struct vkd3d_root_descriptor_table1 *table) + unsigned int offset, struct vkd3d_shader_root_descriptor_table1 *table) { struct vkd3d_shader_descriptor_range1 *ranges; unsigned int count; @@ -2830,7 +2830,7 @@ static int shader_write_descriptor_ranges(struct root_signature_writer_context * } static int shader_write_descriptor_ranges1(struct root_signature_writer_context *context, - const struct vkd3d_root_descriptor_table1 *table) + const struct vkd3d_shader_root_descriptor_table1 *table) { const struct vkd3d_shader_descriptor_range1 *ranges = table->descriptor_ranges; unsigned int i; @@ -2866,7 +2866,7 @@ static int shader_write_descriptor_table(struct root_signature_writer_context *c } static int shader_write_descriptor_table1(struct root_signature_writer_context *context, - const struct vkd3d_root_descriptor_table1 *table) + const struct vkd3d_shader_root_descriptor_table1 *table) { if (!write_dword(context, table->descriptor_range_count)) return VKD3D_ERROR_OUT_OF_MEMORY; @@ -3072,7 +3072,7 @@ static int validate_descriptor_table_v_1_0(const struct vkd3d_shader_root_descri return VKD3D_OK; } -static int validate_descriptor_table_v_1_1(const struct vkd3d_root_descriptor_table1 *descriptor_table) +static int validate_descriptor_table_v_1_1(const struct vkd3d_shader_root_descriptor_table1 *descriptor_table) { bool have_srv_uav_cbv = false; bool have_sampler = false; -- 2.11.0

1 0

[PATCH vkd3d 2/5] vkd3d-shader: Rename the vkd3d_static_border_color enumeration to vkd3d_shader_static_border_colour.
by Henri Verbeet 17 Jul '20

17 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 12 ++++++------ libs/vkd3d-shader/dxbc.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index d6f4aea..cbc4562 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -392,13 +392,13 @@ enum vkd3d_shader_comparison_func VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPARISON_FUNC), }; -enum vkd3d_static_border_color +enum vkd3d_shader_static_border_colour { - VKD3D_STATIC_BORDER_COLOR_TRANSPARENT_BLACK = 0, - VKD3D_STATIC_BORDER_COLOR_OPAQUE_BLACK = 1, - VKD3D_STATIC_BORDER_COLOR_OPAQUE_WHITE = 2, + VKD3D_SHADER_STATIC_BORDER_COLOUR_TRANSPARENT_BLACK = 0x0, + VKD3D_SHADER_STATIC_BORDER_COLOUR_OPAQUE_BLACK = 0x1, + VKD3D_SHADER_STATIC_BORDER_COLOUR_OPAQUE_WHITE = 0x2, - VKD3D_FORCE_32_BIT_ENUM(VKD3D_STATIC_BORDER_COLOR), + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STATIC_BORDER_COLOUR), }; struct vkd3d_static_sampler_desc @@ -410,7 +410,7 @@ struct vkd3d_static_sampler_desc float mip_lod_bias; unsigned int max_anisotropy; enum vkd3d_shader_comparison_func comparison_func; - enum vkd3d_static_border_color border_color; + enum vkd3d_shader_static_border_colour border_colour; float min_lod; float max_lod; unsigned int shader_register; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 1fb8dc8..4f19b85 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2549,7 +2549,7 @@ static int shader_parse_static_samplers(struct root_signature_parser_context *co read_float(&ptr, &sampler_descs[i].mip_lod_bias); read_dword(&ptr, &sampler_descs[i].max_anisotropy); read_dword(&ptr, &sampler_descs[i].comparison_func); - read_dword(&ptr, &sampler_descs[i].border_color); + read_dword(&ptr, &sampler_descs[i].border_colour); read_float(&ptr, &sampler_descs[i].min_lod); read_float(&ptr, &sampler_descs[i].max_lod); read_dword(&ptr, &sampler_descs[i].shader_register); @@ -2989,7 +2989,7 @@ static int shader_write_static_samplers(struct root_signature_writer_context *co return VKD3D_ERROR_OUT_OF_MEMORY; if (!write_dword(context, samplers[i].comparison_func)) return VKD3D_ERROR_OUT_OF_MEMORY; - if (!write_dword(context, samplers[i].border_color)) + if (!write_dword(context, samplers[i].border_colour)) return VKD3D_ERROR_OUT_OF_MEMORY; if (!write_float(context, samplers[i].min_lod)) return VKD3D_ERROR_OUT_OF_MEMORY; -- 2.11.0

1 0

[PATCH vkd3d 1/5] vkd3d-shader: Rename the vkd3d_comparison_func enumeration to vkd3d_shader_comparison_func.
by Henri Verbeet 17 Jul '20

17 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 20f9678..d6f4aea 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -378,18 +378,18 @@ enum vkd3d_shader_texture_address_mode VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TEXTURE_ADDRESS_MODE), }; -enum vkd3d_comparison_func +enum vkd3d_shader_comparison_func { - VKD3D_COMPARISON_FUNC_NEVER = 1, - VKD3D_COMPARISON_FUNC_LESS = 2, - VKD3D_COMPARISON_FUNC_EQUAL = 3, - VKD3D_COMPARISON_FUNC_LESS_EQUAL = 4, - VKD3D_COMPARISON_FUNC_GREATER = 5, - VKD3D_COMPARISON_FUNC_NOT_EQUAL = 6, - VKD3D_COMPARISON_FUNC_GREATER_EQUAL = 7, - VKD3D_COMPARISON_FUNC_ALWAYS = 8, + VKD3D_SHADER_COMPARISON_FUNC_NEVER = 0x1, + VKD3D_SHADER_COMPARISON_FUNC_LESS = 0x2, + VKD3D_SHADER_COMPARISON_FUNC_EQUAL = 0x3, + VKD3D_SHADER_COMPARISON_FUNC_LESS_EQUAL = 0x4, + VKD3D_SHADER_COMPARISON_FUNC_GREATER = 0x5, + VKD3D_SHADER_COMPARISON_FUNC_NOT_EQUAL = 0x6, + VKD3D_SHADER_COMPARISON_FUNC_GREATER_EQUAL = 0x7, + VKD3D_SHADER_COMPARISON_FUNC_ALWAYS = 0x8, - VKD3D_FORCE_32_BIT_ENUM(VKD3D_COMPARISON_FUNC), + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPARISON_FUNC), }; enum vkd3d_static_border_color @@ -409,7 +409,7 @@ struct vkd3d_static_sampler_desc enum vkd3d_shader_texture_address_mode address_w; float mip_lod_bias; unsigned int max_anisotropy; - enum vkd3d_comparison_func comparison_func; + enum vkd3d_shader_comparison_func comparison_func; enum vkd3d_static_border_color border_color; float min_lod; float max_lod; -- 2.11.0

1 0