February 2019 - Wine-Commits

Józef Kucia : vkd3d-shader: Remove v{Fork, Join}InstanceID from symbol table when leaving shader phase.
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: vkd3d Branch: master Commit: d300e6f84cac6d148da132829190fd185ba89893 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d300e6f84cac6d148da1328… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 21 12:32:50 2019 +0100 vkd3d-shader: Remove v{Fork, Join}InstanceID from symbol table when leaving shader phase. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 510fcd3..9838b7c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4978,36 +4978,49 @@ static void vkd3d_dxbc_compiler_emit_dcl_thread_group(struct vkd3d_dxbc_compiler SpvExecutionModeLocalSize, local_size, ARRAY_SIZE(local_size)); } -static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *compiler) +static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_phase *phase) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + struct vkd3d_shader_register reg; + struct vkd3d_symbol reg_symbol; vkd3d_spirv_build_op_function_end(builder); compiler->temp_id = 0; compiler->temp_count = 0; + + if (phase->instance_count) + { + reg.type = phase->type == VKD3DSIH_HS_FORK_PHASE ? VKD3DSPR_FORKINSTID : VKD3DSPR_JOININSTID; + reg.idx[0].offset = ~0u; + vkd3d_symbol_make_register(&reg_symbol, &reg); + rb_remove_key(&compiler->symbol_table, &reg_symbol); + } } static void vkd3d_dxbc_compiler_enter_shader_phase(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { + const struct vkd3d_shader_phase *previous_phase; struct vkd3d_shader_phase *phase; - unsigned int idx; - if ((idx = compiler->shader_phase_count)) - vkd3d_dxbc_compiler_leave_shader_phase(compiler); + if ((previous_phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler))) + vkd3d_dxbc_compiler_leave_shader_phase(compiler, previous_phase); if (!vkd3d_array_reserve((void **)&compiler->shader_phases, &compiler->shader_phases_size, compiler->shader_phase_count + 1, sizeof(*compiler->shader_phases))) return; - phase = &compiler->shader_phases[compiler->shader_phase_count++]; + phase = &compiler->shader_phases[compiler->shader_phase_count]; phase->type = instruction->handler_idx; - phase->idx = idx; + phase->idx = compiler->shader_phase_count; phase->instance_count = 0; phase->function_id = 0; phase->instance_id = 0; phase->function_location = 0; + + ++compiler->shader_phase_count; } static int vkd3d_dxbc_compiler_emit_shader_phase_instance_count(struct vkd3d_dxbc_compiler *compiler,

1 0

Józef Kucia : vkd3d-shader: Avoid generating unique array types for immediate constant buffers.
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: vkd3d Branch: master Commit: d1e0ac115cbd334221d5b844b85ab22eeadec54a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d1e0ac115cbd334221d5b84… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 21 12:32:53 2019 +0100 vkd3d-shader: Avoid generating unique array types for immediate constant buffers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8cbd8da..82598df 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4283,7 +4283,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_immediate_constant_buffer(struct vkd3d_ VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE, &icb->data[4 * i]); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); length_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, icb->vec4_count); - type_id = vkd3d_spirv_build_op_type_array(builder, type_id, length_id); + type_id = vkd3d_spirv_get_op_type_array(builder, type_id, length_id); const_id = vkd3d_spirv_build_op_constant_composite(builder, type_id, elements, icb->vec4_count); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassPrivate, type_id); icb_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream,

1 0

Józef Kucia : tests: Add more tessellation tests.
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: vkd3d Branch: master Commit: 992dfb1a551e4e716261adce474b669cf1d9d764 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=992dfb1a551e4e716261adc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 21 12:32:52 2019 +0100 tests: Add more tessellation tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 255 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 251 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=992dfb1a551e4e71626…

1 0

Józef Kucia : vkd3d-shader: Translate vPrim register.
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: vkd3d Branch: master Commit: 3cbdad5f293fccca24eba1e74b0e55c8836a6c66 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3cbdad5f293fccca24eba1e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 21 12:32:48 2019 +0100 vkd3d-shader: Translate vPrim register. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6ef04a4..2c58a47 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2358,6 +2358,9 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf case VKD3DSPR_DEPTHOUTLE: snprintf(buffer, buffer_size, "oDepth"); break; + case VKD3DSPR_PRIMID: + snprintf(buffer, buffer_size, "vPrim"); + break; case VKD3DSPR_FORKINSTID: snprintf(buffer, buffer_size, "vForkInstanceId"); break; @@ -3084,6 +3087,10 @@ static void vkd3d_dxbc_compiler_decorate_builtin(struct vkd3d_dxbc_compiler *com switch (builtin) { + case SpvBuiltInPrimitiveId: + if (compiler->shader_type == VKD3D_SHADER_TYPE_PIXEL) + vkd3d_spirv_enable_capability(builder, SpvCapabilityGeometry); + break; case SpvBuiltInFragDepth: vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeDepthReplacing, NULL, 0); break; @@ -3204,6 +3211,8 @@ vkd3d_system_value_builtins[] = {VKD3D_SIV_VERTEX_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInVertexIndex, sv_vertex_id_fixup}}, {VKD3D_SIV_INSTANCE_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInInstanceIndex, sv_instance_id_fixup}}, + {VKD3D_SIV_PRIMITIVE_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInPrimitiveId}}, + {VKD3D_SIV_RENDER_TARGET_ARRAY_INDEX, {VKD3D_TYPE_INT, 1, SpvBuiltInLayer}}, {VKD3D_SIV_VIEWPORT_ARRAY_INDEX, {VKD3D_TYPE_INT, 1, SpvBuiltInViewportIndex}}, @@ -3248,6 +3257,8 @@ vkd3d_register_builtins[] = {VKD3DSPR_GSINSTID, {VKD3D_TYPE_INT, 1, SpvBuiltInInvocationId}}, {VKD3DSPR_OUTPOINTID, {VKD3D_TYPE_INT, 1, SpvBuiltInInvocationId}}, + {VKD3DSPR_PRIMID, {VKD3D_TYPE_INT, 1, SpvBuiltInPrimitiveId}}, + {VKD3DSPR_TESSCOORD, {VKD3D_TYPE_FLOAT, 3, SpvBuiltInTessCoord}}, {VKD3DSPR_COVERAGE, {VKD3D_TYPE_UINT, 1, SpvBuiltInSampleMask, NULL, 1}},

1 0

Józef Kucia : vkd3d-shader: Fix swizzle for scalars.
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: vkd3d Branch: master Commit: 7466758f08b6962bdb9821bbb95f2c5dc347917f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7466758f08b6962bdb9821b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 21 12:32:47 2019 +0100 vkd3d-shader: Fix swizzle for scalars. In rare cases, OpCompositeExtract was generated for scalars. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 2b52334..6ef04a4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2661,6 +2661,9 @@ static uint32_t vkd3d_dxbc_compiler_emit_swizzle_ext(struct vkd3d_dxbc_compiler type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count); + if (component_count == 1 && val_component_count == 1) + return val_id; + if (component_count == 1) { component_idx = vkd3d_write_mask_get_component_idx(write_mask);

1 0

Józef Kucia : build: Fix 'make dist'.
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: vkd3d Branch: master Commit: a6bf217af891a00d91811982a29d0a9a95faf126 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a6bf217af891a00d9181198… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 21 12:32:46 2019 +0100 build: Fix 'make dist'. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3e9ddea..d854a5b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,7 +43,8 @@ vkd3d_cross_tests = \ tests/d3d12_invalid_usage vkd3d_test_headers = \ - tests/vkd3d_d3d12_test.h + tests/d3d12_crosstest.h \ + tests/d3d12_test_utils.h vkd3d_demos = \ demos/gears \ @@ -71,7 +72,7 @@ libvkd3d_shader_la_SOURCES = \ include/private/vkd3d_common.h \ include/private/vkd3d_debug.h \ include/private/vkd3d_memory.h \ - include/private/vkd3d_shader.h \ + include/vkd3d_shader.h \ libs/vkd3d-shader/checksum.c \ libs/vkd3d-shader/dxbc.c \ libs/vkd3d-shader/spirv.c \

1 0

Zebediah Figura : quartz/tests/filesource: Add tests for media types.
by Alexandre Julliard Feb. 21, 2019

Feb. 21, 2019

Module: wine Branch: master Commit: 7c6caa4873dbaae093e0ff73c49f0d26b67d289e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c6caa4873dbaae093e0ff73… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 21 00:17:18 2019 -0600 quartz/tests/filesource: Add tests for media types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filesource.c | 178 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 167 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 765c23b..9c94f61 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -170,17 +170,20 @@ static void test_file_source_filter(void) "unknown format", "Hello World", 11, - NULL, /* FIXME: should be &MEDIASUBTYPE_NULL */ + &MEDIASUBTYPE_NULL, }, }; - WCHAR path[MAX_PATH], temp[MAX_PATH]; + WCHAR path[MAX_PATH], temp[MAX_PATH], *filename; + AM_MEDIA_TYPE mt, file_mt, *pmt; IFileSourceFilter *filesource; + IEnumMediaTypes *enum_mt; IBaseFilter *filter; - AM_MEDIA_TYPE mt; OLECHAR *olepath; DWORD written; HANDLE file; HRESULT hr; + ULONG ref; + IPin *pin; BOOL ret; int i; @@ -220,24 +223,177 @@ static void test_file_source_filter(void) CoTaskMemFree(olepath); olepath = NULL; - memset(&mt, 0x11, sizeof(mt)); - hr = IFileSourceFilter_GetCurFile(filesource, &olepath, &mt); + memset(&file_mt, 0x11, sizeof(file_mt)); + hr = IFileSourceFilter_GetCurFile(filesource, &olepath, &file_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!lstrcmpW(olepath, path), "Expected path %s, got %s.\n", wine_dbgstr_w(path), wine_dbgstr_w(olepath)); - ok(IsEqualGUID(&mt.majortype, &MEDIATYPE_Stream), "Got major type %s.\n", - wine_dbgstr_guid(&mt.majortype)); - if (tests[i].subtype) - ok(IsEqualGUID(&mt.subtype, tests[i].subtype), "Expected subtype %s, got %s.\n", - wine_dbgstr_guid(tests[i].subtype), wine_dbgstr_guid(&mt.subtype)); + ok(IsEqualGUID(&file_mt.majortype, &MEDIATYPE_Stream), "Got major type %s.\n", + wine_dbgstr_guid(&file_mt.majortype)); + /* winegstreamer hijacks format type detection. */ + if (!IsEqualGUID(tests[i].subtype, &MEDIASUBTYPE_NULL)) + ok(IsEqualGUID(&file_mt.subtype, tests[i].subtype), "Expected subtype %s, got %s.\n", + wine_dbgstr_guid(tests[i].subtype), wine_dbgstr_guid(&file_mt.subtype)); + ok(file_mt.bFixedSizeSamples == TRUE, "Got fixed size %d.\n", file_mt.bFixedSizeSamples); + ok(file_mt.bTemporalCompression == FALSE, "Got temporal compression %d.\n", + file_mt.bTemporalCompression); +todo_wine { + ok(file_mt.lSampleSize == 1, "Got sample size %u.\n", file_mt.lSampleSize); + ok(IsEqualGUID(&file_mt.formattype, &GUID_NULL), "Got format type %s.\n", + wine_dbgstr_guid(&file_mt.formattype)); +} + ok(!file_mt.pUnk, "Got pUnk %p.\n", file_mt.pUnk); + ok(!file_mt.cbFormat, "Got format size %#x.\n", file_mt.cbFormat); + ok(!file_mt.pbFormat, "Got format %p.\n", file_mt.pbFormat); CoTaskMemFree(olepath); + hr = IBaseFilter_FindPin(filter, source_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_EnumMediaTypes(pin, &enum_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum_mt, 1, &pmt, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!memcmp(pmt, &file_mt, sizeof(*pmt)), "Media types did not match.\n"); + CoTaskMemFree(pmt); + + hr = IEnumMediaTypes_Next(enum_mt, 1, &pmt, NULL); +todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) + { + mt = file_mt; + mt.subtype = GUID_NULL; + ok(!memcmp(pmt, &mt, sizeof(*pmt)), "Media types did not match.\n"); + CoTaskMemFree(pmt); + } + + hr = IEnumMediaTypes_Next(enum_mt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enum_mt); + + mt = file_mt; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.bFixedSizeSamples = FALSE; + mt.bTemporalCompression = TRUE; + mt.lSampleSize = 123; + mt.formattype = FORMAT_VideoInfo; + hr = IPin_QueryAccept(pin, &mt); +todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.majortype = MEDIATYPE_Video; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.majortype = MEDIATYPE_Stream; + + if (!IsEqualGUID(tests[i].subtype, &GUID_NULL)) + { + mt.subtype = GUID_NULL; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + } + + IPin_Release(pin); IFileSourceFilter_Release(filesource); - IBaseFilter_Release(filter); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); ret = DeleteFileW(path); ok(ret, "Failed to delete file, error %u\n", GetLastError()); } + + /* test prescribed format */ + filter = create_file_source(); + hr = IBaseFilter_QueryInterface(filter, &IID_IFileSourceFilter, (void **)&filesource); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.majortype = MEDIATYPE_Video; + mt.subtype = MEDIASUBTYPE_RGB8; + mt.bFixedSizeSamples = FALSE; + mt.bTemporalCompression = TRUE; + mt.lSampleSize = 123; + mt.formattype = FORMAT_None; + mt.pUnk = NULL; + mt.cbFormat = 0; + mt.pbFormat = NULL; + filename = load_resource(avifile); + hr = IFileSourceFilter_Load(filesource, filename, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFileSourceFilter_GetCurFile(filesource, &olepath, &file_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!memcmp(&file_mt, &mt, sizeof(mt)), "Media types did not match.\n"); + CoTaskMemFree(olepath); + + hr = IBaseFilter_FindPin(filter, source_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_EnumMediaTypes(pin, &enum_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum_mt, 1, &pmt, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!memcmp(pmt, &file_mt, sizeof(*pmt)), "Media types did not match.\n"); + CoTaskMemFree(pmt); + + hr = IEnumMediaTypes_Next(enum_mt, 1, &pmt, NULL); +todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) + { + ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Stream), "Got major type %s.\n", + wine_dbgstr_guid(&pmt->majortype)); + ok(IsEqualGUID(&pmt->subtype, &GUID_NULL), "Got subtype %s.\n", + wine_dbgstr_guid(&pmt->subtype)); + ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); + ok(pmt->lSampleSize == 1, "Got sample size %u.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &GUID_NULL), "Got format type %s.\n", + wine_dbgstr_guid(&pmt->formattype)); + ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); + ok(!pmt->cbFormat, "Got format size %#x.\n", pmt->cbFormat); + ok(!pmt->pbFormat, "Got format %p.\n", pmt->pbFormat); + + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + } + + hr = IEnumMediaTypes_Next(enum_mt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enum_mt); + + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.bFixedSizeSamples = TRUE; + mt.bTemporalCompression = FALSE; + mt.lSampleSize = 456; + mt.formattype = FORMAT_VideoInfo; + hr = IPin_QueryAccept(pin, &mt); +todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.majortype = MEDIATYPE_Stream; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.majortype = MEDIATYPE_Video; + + mt.subtype = MEDIASUBTYPE_NULL; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IPin_Release(pin); + IFileSourceFilter_Release(filesource); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); } static void test_enum_pins(void)

1 0

Zebediah Figura : quartz/filesource: Don' t check formattype in FileAsyncReaderPin_CheckMediaType().
by Alexandre Julliard Feb. 21, 2019

Feb. 21, 2019

Module: wine Branch: master Commit: 048474b15e8cbf43a0eec55bcaf24a10ecb5f819 URL: https://source.winehq.org/git/wine.git/?a=commit;h=048474b15e8cbf43a0eec55b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 21 00:17:19 2019 -0600 quartz/filesource: Don't check formattype in FileAsyncReaderPin_CheckMediaType(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 5 +---- dlls/quartz/tests/filesource.c | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index df444ae..ab8d645 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -756,11 +756,8 @@ static HRESULT WINAPI FileAsyncReaderPin_CheckMediaType(BasePin *pin, const AM_M { AM_MEDIA_TYPE *pmt_filter = impl_from_IBaseFilter(pin->pinInfo.pFilter)->pmt; - FIXME("(%p, %p)\n", pin, pmt); - if (IsEqualGUID(&pmt->majortype, &pmt_filter->majortype) && - IsEqualGUID(&pmt->subtype, &pmt_filter->subtype) && - IsEqualGUID(&pmt->formattype, &FORMAT_None)) + IsEqualGUID(&pmt->subtype, &pmt_filter->subtype)) return S_OK; return S_FALSE; diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 9c94f61..845e74d 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -283,7 +283,6 @@ todo_wine mt.lSampleSize = 123; mt.formattype = FORMAT_VideoInfo; hr = IPin_QueryAccept(pin, &mt); -todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); mt.majortype = MEDIATYPE_Video; @@ -376,7 +375,6 @@ todo_wine mt.lSampleSize = 456; mt.formattype = FORMAT_VideoInfo; hr = IPin_QueryAccept(pin, &mt); -todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); mt.majortype = MEDIATYPE_Stream;

1 0

Dmitry Timoshkov : windowscodecs: Add support for CMYK to BGR conversion.
by Alexandre Julliard Feb. 21, 2019

Feb. 21, 2019

Module: wine Branch: master Commit: 812d03129dea53337367789bac8ab523b9fce21d URL: https://source.winehq.org/git/wine.git/?a=commit;h=812d03129dea53337367789b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 21 09:24:54 2019 +0300 windowscodecs: Add support for CMYK to BGR conversion. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/converter.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 9083aa0..3b3030b 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -30,6 +30,7 @@ #include "wincodecs_private.h" +#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); @@ -1121,6 +1122,48 @@ static HRESULT copypixels_to_24bppBGR(struct FormatConverter *This, const WICRec } return S_OK; + case format_32bppCMYK: + if (prc) + { + BYTE *srcdata; + UINT srcstride, srcdatasize; + + srcstride = 4 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = heap_alloc(srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + hr = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + if (SUCCEEDED(hr)) + { + INT x, y; + BYTE *src = srcdata, *dst = pbBuffer; + + for (y = 0; y < prc->Height; y++) + { + BYTE *cmyk = src; + BYTE *bgr = dst; + + for (x = 0; x < prc->Width; x++) + { + BYTE c = cmyk[0], m = cmyk[1], y = cmyk[2], k = cmyk[3]; + bgr[0] = (255 - y) * (255 - k) / 255; /* B */ + bgr[1] = (255 - m) * (255 - k) / 255; /* G */ + bgr[2] = (255 - c) * (255 - k) / 255; /* R */ + cmyk += 4; + bgr += 3; + } + src += srcstride; + dst += cbStride; + } + } + + heap_free(srcdata); + return hr; + } + return S_OK; + default: FIXME("Unimplemented conversion path!\n"); return WINCODEC_ERR_UNSUPPORTEDOPERATION;

1 0

Zebediah Figura : quartz/tests/filesource: Add some tests for querying pin information.
by Alexandre Julliard Feb. 21, 2019

Feb. 21, 2019

Module: wine Branch: master Commit: c2158f7926e22bd80a1291bb54a8630efff0e2c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2158f7926e22bd80a1291bb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 21 00:17:17 2019 -0600 quartz/tests/filesource: Add some tests for querying pin information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filesource.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 6578cbe..765c23b 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -392,6 +392,57 @@ todo_wine ok(ret, "Failed to delete file, error %u.\n", GetLastError()); } +static void test_pin_info(void) +{ + const WCHAR *filename = load_resource(avifile); + IBaseFilter *filter = create_file_source(); + PIN_DIRECTION dir; + PIN_INFO info; + HRESULT hr; + WCHAR *id; + ULONG ref; + IPin *pin; + BOOL ret; + + load_file(filter, filename); + + hr = IBaseFilter_FindPin(filter, source_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); +todo_wine + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, source_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); +todo_wine + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); +todo_wine + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_OUTPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, source_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); +} + START_TEST(filesource) { CoInitialize(NULL); @@ -399,6 +450,7 @@ START_TEST(filesource) test_interfaces(); test_enum_pins(); test_find_pin(); + test_pin_info(); test_file_source_filter(); CoUninitialize();

1 0