- Wine-Devel - list.winehq.org

[PATCH vkd3d 1/5] vkd3d-shader: Change the memory layout of swizzles to allow for future swizzle components.
by Henri Verbeet Aug. 20, 2020

Aug. 20, 2020

We may want to add e.g. VKD3D_SHADER_SWIZZLE_ONE and VKD3D_SHADER_SWIZZLE_ZERO in the future. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 22 ++++++++++++++++------ libs/vkd3d-shader/dxbc.c | 9 +++++++-- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1ece69d..f437b24 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -741,17 +741,27 @@ enum vkd3d_shader_swizzle_component VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SWIZZLE_COMPONENT), }; -#define VKD3D_SHADER_SWIZZLE_MASK (0x3u) -#define VKD3D_SHADER_SWIZZLE_SHIFT(idx) (2u * (idx)) +#define VKD3D_SHADER_SWIZZLE_MASK (0xffu) +#define VKD3D_SHADER_SWIZZLE_SHIFT(idx) (8u * (idx)) #define VKD3D_SHADER_SWIZZLE(x, y, z, w) \ - (((VKD3D_SHADER_SWIZZLE_ ## x) << VKD3D_SHADER_SWIZZLE_SHIFT(0)) \ - | ((VKD3D_SHADER_SWIZZLE_ ## y) << VKD3D_SHADER_SWIZZLE_SHIFT(1)) \ - | ((VKD3D_SHADER_SWIZZLE_ ## z) << VKD3D_SHADER_SWIZZLE_SHIFT(2)) \ - | ((VKD3D_SHADER_SWIZZLE_ ## w) << VKD3D_SHADER_SWIZZLE_SHIFT(3))) + vkd3d_shader_create_swizzle(VKD3D_SHADER_SWIZZLE_ ## x, \ + VKD3D_SHADER_SWIZZLE_ ## y, \ + VKD3D_SHADER_SWIZZLE_ ## z, \ + VKD3D_SHADER_SWIZZLE_ ## w) #define VKD3D_SHADER_NO_SWIZZLE VKD3D_SHADER_SWIZZLE(X, Y, Z, W) +static inline uint32_t vkd3d_shader_create_swizzle(enum vkd3d_shader_swizzle_component x, + enum vkd3d_shader_swizzle_component y, enum vkd3d_shader_swizzle_component z, + enum vkd3d_shader_swizzle_component w) +{ + return ((x & VKD3D_SHADER_SWIZZLE_MASK) << VKD3D_SHADER_SWIZZLE_SHIFT(0)) + | ((y & VKD3D_SHADER_SWIZZLE_MASK) << VKD3D_SHADER_SWIZZLE_SHIFT(1)) + | ((z & VKD3D_SHADER_SWIZZLE_MASK) << VKD3D_SHADER_SWIZZLE_SHIFT(2)) + | ((w & VKD3D_SHADER_SWIZZLE_MASK) << VKD3D_SHADER_SWIZZLE_SHIFT(3)); +} + #ifndef VKD3D_SHADER_NO_PROTOTYPES const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor); diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 89e3c0e..94e4621 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1638,6 +1638,11 @@ static bool shader_sm4_is_scalar_register(const struct vkd3d_shader_register *re } } +static uint32_t swizzle_from_sm4(uint32_t s) +{ + return vkd3d_shader_create_swizzle(s & 0x3, (s >> 2) & 0x3, (s >> 4) & 0x3, (s >> 6) & 0x3); +} + static bool shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum vkd3d_data_type data_type, struct vkd3d_shader_src_param *src_param) { @@ -1676,11 +1681,11 @@ static bool shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD * case VKD3D_SM4_SWIZZLE_SCALAR: src_param->swizzle = (token & VKD3D_SM4_SWIZZLE_MASK) >> VKD3D_SM4_SWIZZLE_SHIFT; - src_param->swizzle = (src_param->swizzle & 0x3) * 0x55; + src_param->swizzle = (src_param->swizzle & 0x3) * 0x01010101; break; case VKD3D_SM4_SWIZZLE_VEC4: - src_param->swizzle = (token & VKD3D_SM4_SWIZZLE_MASK) >> VKD3D_SM4_SWIZZLE_SHIFT; + src_param->swizzle = swizzle_from_sm4((token & VKD3D_SM4_SWIZZLE_MASK) >> VKD3D_SM4_SWIZZLE_SHIFT); break; default: -- 2.11.0

1 0

[PATCH] msvcrt: Optimize memmove implementation.
by Piotr Caban Aug. 20, 2020

Aug. 20, 2020

Based on Torbjorn Granlund code from Glibc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49663 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/string.c | 91 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 87 insertions(+), 4 deletions(-)

1 0

[PATCH 1/2] ras.h: Add RASCREDENTIALSA/W structures
by Oleg Dubinskiy Aug. 20, 2020

Aug. 20, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49726 Signed-off-by: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> --- include/ras.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/ras.h b/include/ras.h index a8c04da2b6..bd29343dc5 100644 --- a/include/ras.h +++ b/include/ras.h @@ -372,6 +372,27 @@ typedef struct tagRASCONNSTATUSW DECL_WINELIB_TYPE_AW(RASCONNSTATUS) +typedef struct tagRASCREDENTIALSA +{ + DWORD dwSize; + DWORD dwMask; + CHAR szUserName[UNLEN + 1]; + CHAR szPassword[PWLEN + 1]; + CHAR szDomain[DNLEN + 1]; +} RASCREDENTIALSA,*LPRASCREDENTIALSA; + +typedef struct tagRASCREDENTIALSW +{ + DWORD dwSize; + DWORD dwMask; + WCHAR szUserName[UNLEN + 1]; + WCHAR szPassword[PWLEN + 1]; + WCHAR szDomain[DNLEN + 1]; +} RASCREDENTIALSW,*LPRASCREDENTIALSW; + +DECL_WINELIB_TYPE_AW(RASCREDENTIALS) +DECL_WINELIB_TYPE_AW(LPRASCREDENTIALS) + typedef enum tagRASPROJECTION { RASP_Amb = 0x10000, -- 2.28.0

4 5

[PATCH] quartz: Close hfile when GetFileSizeEx fails in IFileSourceFilter::Load() (Coverity).
by Gijs Vermeulen Aug. 20, 2020

Aug. 20, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/quartz/filesource.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index a553b8517e..79df639ab4 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -478,6 +478,7 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi if (!GetFileSizeEx(hFile, &This->file_size)) { WARN("Could not get file size.\n"); + CloseHandle(hFile); return HRESULT_FROM_WIN32(GetLastError()); } -- 2.28.0

2 1

[PATCH] qcap/tests: Remove unused enumMediaTypes in test_smart_tee_filter() (Coverity).
by Gijs Vermeulen Aug. 20, 2020

Aug. 20, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/qcap/tests/smartteefilter.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index f3a44c67c1..1364beef16 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -2142,7 +2142,6 @@ static void test_smart_tee_filter(void) FILTER_INFO filterInfo; int pinNumber = 0; IMemInputPin *memInputPin = NULL; - IEnumMediaTypes *enumMediaTypes = NULL; hr = CoCreateInstance(&CLSID_SmartTee, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void**)&smartTeeFilter); @@ -2213,8 +2212,6 @@ end: IEnumPins_Release(enumPins); if (memInputPin) IMemInputPin_Release(memInputPin); - if (enumMediaTypes) - IEnumMediaTypes_Release(enumMediaTypes); } static void test_unconnected_filter_state(void) -- 2.28.0

2 1

[PATCH v2 1/2] amstream: Return VFW_E_CANNOT_CONNECT in IAMMultiMediaStream::OpenFile() when no renderers are present and AMMSF_NORENDER is not specified.
by Gijs Vermeulen Aug. 20, 2020

Aug. 20, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/multimedia.c | 17 ++++++++++++++- dlls/amstream/tests/amstream.c | 38 ++++++++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 414a903cf2..5425ef42a3 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -447,7 +447,22 @@ static HRESULT WINAPI multimedia_stream_OpenFile(IAMMultiMediaStream *iface, } if (SUCCEEDED(ret) && !(flags & AMMSF_NORENDER)) - ret = IGraphBuilder_Render(This->graph, This->ipin); + { + IFilterGraph2 *graph; + + if (SUCCEEDED(ret = IGraphBuilder_QueryInterface(This->graph, &IID_IFilterGraph2, (void **)&graph))) + { + ret = IFilterGraph2_RenderEx(graph, This->ipin, AM_RENDEREX_RENDERTOEXISTINGRENDERERS, NULL); + if (ret == VFW_E_CANNOT_RENDER) ret = VFW_E_CANNOT_CONNECT; + else if (ret == VFW_S_PARTIAL_RENDER) ret = S_OK; + IFilterGraph2_Release(graph); + } + else + { + FIXME("Failed to get IFilterGraph2 interface, hr %#x.\n", ret); + ret = IGraphBuilder_Render(This->graph, This->ipin); + } + } IMediaStreamFilter_SupportSeeking(This->filter, This->type == STREAMTYPE_READ); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 910ab11f52..6a72f3ed89 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -283,13 +283,47 @@ static void test_openfile(const WCHAR *test_avi_path) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!graph, "Expected NULL graph.\n"); + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(!!filter, "Expected non-NULL filter.\n"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_interface(filter, &IID_IMediaSeeking, FALSE); + hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, AMMSF_NORENDER); ok(hr == S_OK, "Got hr %#x.\n", hr); + check_interface(filter, &IID_IMediaSeeking, FALSE); + + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!graph, "Expected non-NULL graph.\n"); + IGraphBuilder_Release(graph); + IMediaStreamFilter_Release(filter); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + mmstream = create_ammultimediastream(); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!graph, "Expected NULL graph.\n"); + + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(!!filter, "Expected non-NULL filter.\n"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_interface(filter, &IID_IMediaSeeking, FALSE); + + hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, 0); + ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); + + check_interface(filter, &IID_IMediaSeeking, FALSE); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!!graph, "Expected non-NULL graph.\n"); IGraphBuilder_Release(graph); + IMediaStreamFilter_Release(filter); ref = IAMMultiMediaStream_Release(mmstream); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -389,12 +423,12 @@ static void test_mmstream_get_duration(const WCHAR *test_avi_path) mmstream = create_ammultimediastream(); hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, 0); - todo_wine ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); + ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); duration = 0xdeadbeefdeadbeefULL; hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); - todo_wine ok(duration == 0, "Got duration %s.\n", wine_dbgstr_longlong(duration)); + ok(duration == 0, "Got duration %s.\n", wine_dbgstr_longlong(duration)); ref = IAMMultiMediaStream_Release(mmstream); ok(!ref, "Got outstanding refcount %d.\n", ref); -- 2.28.0

2 3

[PATCH v2 6/6] include/dxgi1_6.idl: Add missing values in DXGI_ADAPTER_FLAG3 enum.
by Biswapriyo Nath Aug. 20, 2020

Aug. 20, 2020

2 1

[PATCH v2 5/6] include/dxgi1_5.idl: Add missing values in DXGI_HDR_METADATA_TYPE enum.
by Biswapriyo Nath Aug. 20, 2020

Aug. 20, 2020

2 1

[PATCH v2 4/6] dxgi: Fix order of functions in IDXGIFactory2 interface.
by Biswapriyo Nath Aug. 20, 2020

Aug. 20, 2020

2 1

[PATCH v2 3/6] include/dxgi1_2.idl: Add missing values in DXGI_SCALING enum.
by Biswapriyo Nath Aug. 20, 2020

Aug. 20, 2020

2 1