February 2021 - Wine-devel - list.winehq.org

[tools] winetest/dissect: Fix the 'failed' summary lines.
by Francois Gouget 19 Feb '21

19 Feb '21

The source must always be in the 8th field, not the 6th! So put placeholders to replace the failure and skip counts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This bug causes 'uninitialized value' errors in gather when it fails to find a source file to link to. --- winetest/dissect | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 73eae4b8c..32c4a9269 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -798,7 +798,7 @@ while ($line = <IN>) { if ($l_rc == 258) { add_test_line("end", "Test failed: timed out"); - $summary = "failed 258"; + $summary = "failed 258 - -"; $extra_failures++; $broken = 1; } @@ -808,7 +808,7 @@ while ($line = <IN>) { if ($l_rc & 0xc0000000) { add_test_line("end", sprintf("Test failed: crash (%08x)", $l_rc & 0xffffffff)); - $summary = "failed crash"; + $summary = "failed crash - -"; $extra_failures++; $broken = 1; } @@ -821,7 +821,7 @@ while ($line = <IN>) { elsif ($l_rc & 0xc0000000) { add_test_line("end", sprintf("Test failed: crash (%08x)", $l_rc & 0xffffffff)); - $summary = "failed crash"; + $summary = "failed crash - -"; $extra_failures++; $broken = 1; } -- 2.20.1

1 0

[PATCH v2] msdrm: Add stub DRMRegisterContent function.
by Vijay Kiran Kamuju 19 Feb '21

19 Feb '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50595 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH resend] msdrm: Add stub DRMRegisterContent function.
by Vijay Kiran Kamuju 19 Feb '21

19 Feb '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50595 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH resend] uiautomationcore: Add stub UiaNodeFromFocus function
by Vijay Kiran Kamuju 19 Feb '21

19 Feb '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50576 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v3 7/7] wldap32: supply our username as SASL_CB_AUTHNAME too
by Damjan Jovanovic 19 Feb '21

19 Feb '21

Try 3 gives up the attempt to provide credentials in an authentication method specific form, and just provides our username as the authentication username (SASL_CB_AUTHNAME) too. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50572 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/wldap32/bind.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

3 7

[PATCH] mf/tests: Add a sample copier test for sample fields handling.
by Nikolay Sivov 19 Feb '21

19 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 56 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 11eff78b645..65f2b40faa9 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4918,20 +4918,51 @@ static void test_sample_copier(void) IMFTransform_Release(copier); } +struct sample_metadata +{ + unsigned int flags; + LONGLONG duration; + LONGLONG time; +}; + static void sample_copier_process(IMFTransform *copier, IMFMediaBuffer *input_buffer, - IMFMediaBuffer *output_buffer) + IMFMediaBuffer *output_buffer, const struct sample_metadata *md) { + static const struct sample_metadata zero_md = { 0, ~0u, ~0u }; IMFSample *input_sample, *output_sample; MFT_OUTPUT_DATA_BUFFER buffer; + unsigned int flags; + LONGLONG time; DWORD status; HRESULT hr; hr = MFCreateSample(&input_sample); ok(hr == S_OK, "Failed to create a sample, hr %#x.\n", hr); + if (md) + { + hr = IMFSample_SetSampleFlags(input_sample, md->flags); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_SetSampleTime(input_sample, md->time); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_SetSampleDuration(input_sample, md->duration); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + } + hr = MFCreateSample(&output_sample); ok(hr == S_OK, "Failed to create a sample, hr %#x.\n", hr); + hr = IMFSample_SetSampleFlags(output_sample, ~0u); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_SetSampleTime(output_sample, ~0u); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_SetSampleDuration(output_sample, ~0u); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFSample_AddBuffer(input_sample, input_buffer); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -4947,6 +4978,18 @@ static void sample_copier_process(IMFTransform *copier, IMFMediaBuffer *input_bu hr = IMFTransform_ProcessOutput(copier, 0, 1, &buffer, &status); ok(hr == S_OK, "Failed to get output, hr %#x.\n", hr); + if (!md) md = &zero_md; + + hr = IMFSample_GetSampleFlags(output_sample, &flags); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(md->flags == flags, "Unexpected flags.\n"); + hr = IMFSample_GetSampleTime(output_sample, &time); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(md->time == time, "Unexpected time.\n"); + hr = IMFSample_GetSampleDuration(output_sample, &time); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(md->duration == time, "Unexpected duration.\n"); + IMFSample_Release(input_sample); IMFSample_Release(output_sample); } @@ -4955,6 +4998,7 @@ static void test_sample_copier_output_processing(void) { IMFMediaBuffer *input_buffer, *output_buffer; MFT_OUTPUT_STREAM_INFO output_info; + struct sample_metadata md; IMFMediaType *mediatype; IMFTransform *copier; DWORD max_length; @@ -5007,7 +5051,7 @@ static void test_sample_copier_output_processing(void) hr = IMFMediaBuffer_SetCurrentLength(input_buffer, 4); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - sample_copier_process(copier, input_buffer, output_buffer); + sample_copier_process(copier, input_buffer, output_buffer, NULL); hr = IMFMediaBuffer_Lock(output_buffer, &ptr, &max_length, NULL); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -5016,6 +5060,14 @@ static void test_sample_copier_output_processing(void) hr = IMFMediaBuffer_Unlock(output_buffer); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + md.flags = 123; + md.time = 10; + md.duration = 2; + sample_copier_process(copier, input_buffer, output_buffer, &md); + + IMFMediaBuffer_Release(input_buffer); + IMFMediaBuffer_Release(output_buffer); + IMFMediaType_Release(mediatype); IMFTransform_Release(copier); } -- 2.30.0

2 2

[PATCH] msado15: Semi-stub _Recordset Open
by Alistair Leslie-Hughes 19 Feb '21

19 Feb '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 65 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 3 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 12bb9680258..8dab455fb67 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1182,15 +1182,74 @@ static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT CursorTypeEnum cursor_type, LockTypeEnum lock_type, LONG options ) { struct recordset *recordset = impl_from_Recordset( iface ); + ADOConnectionConstruction15 *construct; + IUnknown *session = NULL; + IOpenRowset *openrowset = NULL; + IDBCreateCommand *create_command = NULL; + ICommand *cmd = NULL; + ICommandText *command_text = NULL; + DBROWCOUNT affected; + IUnknown *rowset = NULL; + HRESULT hr; - FIXME( "%p, %s, %s, %d, %d, %d\n", recordset, debugstr_variant(&source), debugstr_variant(&active_connection), + FIXME( "%p, %s, %s, %d, %d, %d Semi-stub\n", recordset, debugstr_variant(&source), debugstr_variant(&active_connection), cursor_type, lock_type, options ); - if (!recordset->fields) return MAKE_ADO_HRESULT( adErrInvalidConnection ); if (recordset->state == adStateOpen) return MAKE_ADO_HRESULT( adErrObjectOpen ); + if (V_VT(&active_connection) != VT_DISPATCH) + { + FIXME("Unsupported Active connection type %d\n", V_VT(&active_connection)); + return E_FAIL; + } + + hr = IDispatch_QueryInterface(V_DISPATCH(&active_connection), &IID_ADOConnectionConstruction15, (void**)&construct); + if (FAILED(hr)) + return E_FAIL; + + hr = ADOConnectionConstruction15_get_Session(construct, &session); + ADOConnectionConstruction15_Release(construct); + if (FAILED(hr)) + return E_FAIL; + + hr = IUnknown_QueryInterface(session, &IID_IOpenRowset, (void**)&openrowset); + if (FAILED(hr)) return hr; + + hr = IOpenRowset_QueryInterface(openrowset, &IID_IDBCreateCommand, (void**)&create_command); + if (FAILED(hr)) + goto done; + + hr = IDBCreateCommand_CreateCommand(create_command, NULL, &IID_IUnknown, (IUnknown **)&cmd); + if (FAILED(hr)) + goto done; + + hr = ICommand_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); + if (FAILED(hr)) + { + FIXME("Currently only ICommandText interface is support\n"); + goto done; + } + + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, V_BSTR(&source)); + if (FAILED(hr)) + goto done; + + hr = ICommandText_Execute(command_text, NULL, &IID_IUnknown, NULL, &affected, &rowset); + if (FAILED(hr)) + goto done; + + ADORecordsetConstruction_put_Rowset(&recordset->ADORecordsetConstruction_iface, rowset); + recordset->cursor_type = cursor_type; recordset->state = adStateOpen; - return S_OK; + +done: + if (session) IUnknown_Release(session); + if (rowset) IUnknown_Release(rowset); + if (command_text) ICommandText_Release(command_text); + if (cmd) ICommand_Release(cmd); + if (create_command) IDBCreateCommand_Release(create_command); + if (openrowset) IOpenRowset_Release(openrowset); + return hr; } static HRESULT WINAPI recordset_Requery( _Recordset *iface, LONG options ) -- 2.30.0

4 3

[PATCH 1/2] xactengine3_7: Implement IXACT3Engine PrepareStreamingWave
by Alistair Leslie-Hughes 19 Feb '21

19 Feb '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 55 +++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 8b9ee33ab5c..e82b117b825 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -985,8 +985,59 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareStreamingWave(IXACT3Engine *iface, IXACT3Wave **ppWave) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); - FIXME("(%p): stub!\n", This); - return E_NOTIMPL; + XACT3WaveImpl *wave; + FACTWave *fwave = NULL; + FACTStreamingParameters fakeParms; + wrap_readfile_struct *fake; + FACTWaveBankEntry fact_wavebank; + UINT ret; + + TRACE("(%p)->(0x%08x, %p, %p, %d, %p, %d, %d, %p)\n", This, dwFlags, &entry, &streamingParams, + dwAlignment, pdwSeekTable, dwPlayOffset, nLoopCount, ppWave); + + fake = (wrap_readfile_struct*) CoTaskMemAlloc( + sizeof(wrap_readfile_struct)); + fake->engine = This; + fake->file = streamingParams.file; + fakeParms.file = fake; + fakeParms.flags = streamingParams.flags; + fakeParms.offset = streamingParams.offset; + fakeParms.packetSize = streamingParams.packetSize; + + fact_wavebank.dwFlagsAndDuration = entry.u.dwFlagsAndDuration; + fact_wavebank.Format.dwValue = entry.Format.dwValue; + fact_wavebank.PlayRegion.dwOffset = entry.PlayRegion.dwOffset; + fact_wavebank.PlayRegion.dwLength = entry.PlayRegion.dwLength; + fact_wavebank.LoopRegion.dwStartSample = entry.LoopRegion.dwStartSample; + fact_wavebank.LoopRegion.dwTotalSamples = entry.LoopRegion.dwTotalSamples; + + /* FAudio Prototype is incorrect and shouldn't take a buffer as an parameter, + * passing through NULL to ensure it's not used. + */ + ret = FACTAudioEngine_PrepareStreamingWave(This->fact_engine, dwFlags, fact_wavebank, fakeParms, + dwAlignment, pdwSeekTable, NULL, dwPlayOffset, nLoopCount, &fwave); + + if(ret != 0 || !fwave) + { + ERR("Failed to CreateWave: %d (%p)\n", ret, fwave); + return E_FAIL; + } + + wave = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wave)); + if (!wave) + { + FACTWave_Destroy(fwave); + ERR("Failed to allocate XACT3WaveImpl!"); + return E_OUTOFMEMORY; + } + + wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; + wave->fact_wave = fwave; + *ppWave = &wave->IXACT3Wave_iface; + + TRACE("Created Wave: %p\n", wave); + + return S_OK; } static HRESULT WINAPI IXACT3EngineImpl_PrepareWave(IXACT3Engine *iface, -- 2.30.0

2 1

[PATCH 1/5] dwrite/layout: Check text range boundaries when setting properties.
by Nikolay Sivov 19 Feb '21

19 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/layout.c | 3 + dlls/dwrite/tests/layout.c | 386 +++++++++++++++++++++++++++++++++++++ 2 files changed, 389 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index b2e16447334..5dcf62d4690 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2728,6 +2728,9 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo if (value->range.length == 0) return S_OK; + if (~0u - value->range.startPosition < value->range.length) + return E_INVALIDARG; + /* select from ranges lists */ switch (attr) { diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 6f06e842493..bff95ca3bb6 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -5971,6 +5971,391 @@ if (SUCCEEDED(hr)) IDWriteFactory6_Release(factory); } +static void test_layout_range_length(void) +{ + IDWriteInlineObject *sign, *object; + IDWriteFontCollection *collection; + IDWriteTypography *typography; + DWRITE_FONT_STRETCH stretch; + IDWriteTextLayout1 *layout1; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + DWRITE_FONT_WEIGHT weight; + DWRITE_FONT_STYLE style; + DWRITE_TEXT_RANGE range; + IDWriteFactory *factory; + HRESULT hr; + BOOL value; + + factory = create_factory(); + + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"ru", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); + + /* Range length is validated when setting properties. */ + + hr = IDWriteFactory_CreateTextLayout(factory, L"string", 6, format, 100.0f, 100.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); + + /* Weight */ + range.startPosition = 10; + range.length = ~0u; + hr = IDWriteTextLayout_SetFontWeight(layout, DWRITE_FONT_WEIGHT_NORMAL, range); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + range.startPosition = 10; + range.length = ~0u - 9; + hr = IDWriteTextLayout_SetFontWeight(layout, DWRITE_FONT_WEIGHT_NORMAL, range); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + range.startPosition = 10; + range.length = ~0u - 10; + hr = IDWriteTextLayout_SetFontWeight(layout, DWRITE_FONT_WEIGHT_HEAVY, range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + range.startPosition = range.length = 0; + hr = IDWriteTextLayout_GetFontWeight(layout, 0, &weight, &range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(range.startPosition == 0 && range.length == 10, "Unexpected range (%u, %u).\n", range.startPosition, range.length); + + range.startPosition = range.length = 0; + hr = IDWriteTextLayout_GetFontWeight(layout, 10, &weight, &range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(range.startPosition == 10 && range.length == ~0u - 10, "Unexpected range (%u, %u).\n", + range.startPosition, range.length); + + range.startPosition = 0; + range.length = ~0u; + hr = IDWriteTextLayout_SetFontWeight(layout, DWRITE_FONT_WEIGHT_NORMAL, range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Family name */ + range.startPosition = 10; + range.length = ~0u; + hr = IDWriteTextLayout_SetFontFamilyName(layout, L"family", range); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + range.startPosition = 10; + range.length = ~0u - 9; + hr = IDWriteTextLayout_SetFontFamilyName(layout, L"family", range); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + range.startPosition = 10; + range.length = ~0u - 10; + hr = IDWriteTextLayout_SetFontFamilyName(layout, L"family", range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + range.startPosition = 0; + range.length = ~0u; + hr = IDWriteTextLayout_SetFontFamilyName(layout, L"Tahoma", range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Style */ + range.startPosition = 10; + range.length = ~0u; + hr = IDWriteTextLayout_SetFontStyle(layout, DWRITE_FONT_STYLE_ITALIC, range); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + range.startPosition = 10; + range.length = ~0u - 9; + hr = IDWriteTextLayout_SetFontStyle(layout, DWRITE_FONT_STYLE_ITALIC, range); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + range.startPosition = 10; + range.length = ~0u - 10; + hr = IDWriteTextLayout_SetFontStyle(layout, DWRITE_FONT_STYLE_ITALIC, range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + range.startPosition = range.length = 0; + hr = IDWriteTextLayout_GetFontStyle(layout, 0, &style, &range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(range.startPosition == 0 && range.length == 10, "Unexpected range (%u, %u).\n", range.startPosition, range.length); + + range.startPosition = range.length = 0; + hr = IDWriteTextLayout_GetFontStyle(layout, 10, &style, &range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(range.startPosition == 10 && range.length == ~0u - 10, "Unexpected range (%u, %u).\n", + range.startPosition, range.length); + + range.startPosition = 0; + range.length = ~0u; + hr = IDWriteTextLayout_SetFontStyle(layout, DWRITE_FONT_STYLE_NORMAL, range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Stretch */ + range.startPosition = 10; + range.length = ~0u; + hr = IDWriteTextLayout_SetFontStretch(layout, DWRITE_FONT_STRETCH_CONDENSED, range); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + range.startPosition = 10; + range.length = ~0u - 9; + hr = IDWriteTextLayout_SetFontStretch(layout, DWRITE_FONT_STRETCH_CONDENSED, range); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + range.startPosition = 10; + range.length = ~0u - 10; + hr = IDWriteTextLayout_SetFontStretch(layout, DWRITE_FONT_STRETCH_CONDENSED, range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + range.startPosition = range.length = 0; + hr = IDWriteTextLayout_GetFontStretch(layout, 0, &stretch, &range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(range.startPosition == 0 && range.length == 10, "Unexpected range (%u, %u).\n", range.startPosition, range.length); + + range.startPosition = range.length = 0; + hr = IDWriteTextLayout_GetFontStretch(layout, 10, &stretch, &range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(range.startPosition == 10 && range.length == ~0u - 10, "Unexpected range (%u, %u).\n", + range.startPosition, range.length); + + range.startPosition = 0; + range.length = ~0u; + hr = IDWriteTextLayout_SetFontStretch(layout, DWRITE_FONT_STRETCH_NORMAL, range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Underline */ + range.startPosition = 10; + range.length = ~0u; + hr = IDWriteTextLayout_SetUnderline(layout, TRUE, range); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + range.startPosition = 10; + range.length = ~0u - 9; + hr = IDWriteTextLayout_SetUnderline(layout, TRUE, range); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + range.startPosition = 10; + range.length = ~0u - 10; + hr = IDWriteTextLayout_SetUnderline(layout, TRUE, range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + range.startPosition = range.length = 0; + hr = IDWriteTextLayout_GetUnderline(layout, 0, &value, &range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(range.startPosition == 0 && range.length == 10, "Unexpected range (%u, %u).\n", range.startPosition, range.length); + + range.startPosition = range.length = 0; + hr = IDWriteTextLayout_GetUnderline(layout, 10, &value, &range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(range.startPosition == 10 && range.length == ~0u - 10, "Unexpected range (%u, %u).\n", + range.startPosition, range.length); + + range.startPosition = 0; + range.length = ~0u; + hr = IDWriteTextLayout_SetUnderline(layout, FALSE, range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Strikethrough */ + range.startPosition = 10; + range.length = ~0u; + hr = IDWriteTextLayout_SetStrikethrough(layout, TRUE, range); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + range.startPosition = 10; + range.length = ~0u - 9; + hr = IDWriteTextLayout_SetStrikethrough(layout, TRUE, range); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + range.startPosition = 10; + range.length = ~0u - 10; + hr = IDWriteTextLayout_SetStrikethrough(layout, TRUE, range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + range.startPosition = range.length = 0; + hr = IDWriteTextLayout_GetStrikethrough(layout, 0, &value, &range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(range.startPosition == 0 && range.length == 10, "Unexpected range (%u, %u).\n", range.startPosition, range.length); + + range.startPosition = range.length = 0; + hr = IDWriteTextLayout_GetStrikethrough(layout, 10, &value, &range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(range.startPosition == 10 && range.length == ~0u - 10, "Unexpected range (%u, %u).\n", + range.startPosition, range.length); + + range.startPosition = 0; + range.length = ~0u; + hr = IDWriteTextLayout_SetStrikethrough(layout, FALSE, range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Locale name */ + range.startPosition = 10; + range.length = ~0u; + hr = IDWriteTextLayout_SetLocaleName(layout, L"locale", range); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + range.startPosition = 10; + range.length = ~0u - 9; + hr = IDWriteTextLayout_SetLocaleName(layout, L"locale", range); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + range.startPosition = 10; + range.length = ~0u - 10; + hr = IDWriteTextLayout_SetLocaleName(layout, L"locale", range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + range.startPosition = 0; + range.length = ~0u; + hr = IDWriteTextLayout_SetLocaleName(layout, L"ru", range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Inline object */ + hr = IDWriteFactory_CreateEllipsisTrimmingSign(factory, format, &sign); + ok(hr == S_OK, "got 0x%08x\n", hr); + + range.startPosition = 10; + range.length = ~0u; + hr = IDWriteTextLayout_SetInlineObject(layout, sign, range); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + range.startPosition = 10; + range.length = ~0u - 9; + hr = IDWriteTextLayout_SetInlineObject(layout, sign, range); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + range.startPosition = 10; + range.length = ~0u - 10; + hr = IDWriteTextLayout_SetInlineObject(layout, sign, range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + range.startPosition = range.length = 0; + object = NULL; + hr = IDWriteTextLayout_GetInlineObject(layout, 10, &object, &range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(range.startPosition == 10 && range.length == ~0u - 10, "Unexpected range (%u, %u).\n", + range.startPosition, range.length); + if (object) + IDWriteInlineObject_Release(object); + + range.startPosition = 0; + range.length = ~0u; + hr = IDWriteTextLayout_SetInlineObject(layout, NULL, range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Drawing effect */ + range.startPosition = 10; + range.length = ~0u; + hr = IDWriteTextLayout_SetDrawingEffect(layout, (IUnknown *)sign, range); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + range.startPosition = 10; + range.length = ~0u - 9; + hr = IDWriteTextLayout_SetDrawingEffect(layout, (IUnknown *)sign, range); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + range.startPosition = 10; + range.length = ~0u - 10; + hr = IDWriteTextLayout_SetDrawingEffect(layout, (IUnknown *)sign, range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + range.startPosition = 0; + range.length = ~0u; + hr = IDWriteTextLayout_SetDrawingEffect(layout, NULL, range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IDWriteInlineObject_Release(sign); + + /* Typography */ + hr = IDWriteFactory_CreateTypography(factory, &typography); + ok(hr == S_OK, "got 0x%08x\n", hr); + + range.startPosition = 10; + range.length = ~0u; + hr = IDWriteTextLayout_SetTypography(layout, typography, range); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + range.startPosition = 10; + range.length = ~0u - 9; + hr = IDWriteTextLayout_SetTypography(layout, typography, range); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + range.startPosition = 10; + range.length = ~0u - 10; + hr = IDWriteTextLayout_SetTypography(layout, typography, range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + range.startPosition = 0; + range.length = ~0u; + hr = IDWriteTextLayout_SetTypography(layout, NULL, range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IDWriteTypography_Release(typography); + + /* Font collection */ + hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "Failed to get system collection, hr %#x.\n", hr); + + range.startPosition = 10; + range.length = ~0u; + hr = IDWriteTextLayout_SetFontCollection(layout, collection, range); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + range.startPosition = 10; + range.length = ~0u - 9; + hr = IDWriteTextLayout_SetFontCollection(layout, collection, range); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + range.startPosition = 10; + range.length = ~0u - 10; + hr = IDWriteTextLayout_SetFontCollection(layout, collection, range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + range.startPosition = 0; + range.length = ~0u; + hr = IDWriteTextLayout_SetFontCollection(layout, NULL, range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IDWriteFontCollection_Release(collection); + + if (SUCCEEDED(IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout1, (void **)&layout1))) + { + /* Pair kerning */ + range.startPosition = 10; + range.length = ~0u; + hr = IDWriteTextLayout1_SetPairKerning(layout1, TRUE, range); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + range.startPosition = 10; + range.length = ~0u - 9; + hr = IDWriteTextLayout1_SetPairKerning(layout1, TRUE, range); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + range.startPosition = 10; + range.length = ~0u - 10; + hr = IDWriteTextLayout1_SetPairKerning(layout1, TRUE, range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + range.startPosition = range.length = 0; + hr = IDWriteTextLayout1_GetPairKerning(layout1, 0, &value, &range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(range.startPosition == 0 && range.length == 10, "Unexpected range (%u, %u).\n", range.startPosition, range.length); + + range.startPosition = range.length = 0; + value = FALSE; + hr = IDWriteTextLayout1_GetPairKerning(layout1, 10, &value, &range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + todo_wine { + ok(range.startPosition == 10 && range.length == ~0u - 10, "Unexpected range (%u, %u).\n", + range.startPosition, range.length); + ok(!!value, "Unexpected value %d.\n", value); + } + range.startPosition = 0; + range.length = ~0u; + hr = IDWriteTextLayout1_SetPairKerning(layout1, FALSE, range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IDWriteTextLayout1_Release(layout1); + } + + IDWriteTextLayout_Release(layout); + + IDWriteTextFormat_Release(format); + IDWriteFactory_Release(factory); +} + START_TEST(layout) { IDWriteFactory *factory; @@ -6024,6 +6409,7 @@ START_TEST(layout) test_tab_stops(); test_automatic_font_axes(); test_text_format_axes(); + test_layout_range_length(); IDWriteFactory_Release(factory); } -- 2.30.0

1 4

[PATCH] mfreadwrite/reader: Add support for reading to SA-allocated samples.
by Nikolay Sivov 19 Feb '21

19 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/reader.c | 141 +++++++++++++++++++++++++++++--------- 1 file changed, 110 insertions(+), 31 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index ec7d3fd62e6..9903898a155 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -85,6 +85,7 @@ struct stream_response DWORD stream_flags; LONGLONG timestamp; IMFSample *sample; + unsigned int sa_pending : 1; }; enum media_stream_state @@ -365,12 +366,83 @@ static HRESULT WINAPI source_reader_callback_GetParameters(IMFAsyncCallback *ifa return E_NOTIMPL; } +static void source_reader_response_ready(struct source_reader *reader, struct stream_response *response) +{ + struct source_reader_async_command *command; + struct media_stream *stream = &reader->streams[response->stream_index]; + HRESULT hr; + + if (!stream->requests || response->sa_pending) + return; + + if (reader->async_callback) + { + if (SUCCEEDED(source_reader_create_async_op(SOURCE_READER_ASYNC_SAMPLE_READY, &command))) + { + command->u.sample.stream_index = stream->index; + if (FAILED(hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &reader->async_commands_callback, + &command->IUnknown_iface))) + WARN("Failed to submit async result, hr %#x.\n", hr); + IUnknown_Release(&command->IUnknown_iface); + } + } + else + WakeAllConditionVariable(&reader->sample_event); + + stream->requests--; +} + +static void source_reader_copy_sample_buffer(IMFSample *src, IMFSample *dst) +{ + IMFMediaBuffer *buffer; + unsigned int flags; + LONGLONG time; + HRESULT hr; + + IMFSample_CopyAllItems(src, (IMFAttributes *)dst); + + IMFSample_SetSampleDuration(dst, 0); + IMFSample_SetSampleTime(dst, 0); + IMFSample_SetSampleFlags(dst, 0); + + if (SUCCEEDED(IMFSample_GetSampleDuration(src, &time))) + IMFSample_SetSampleDuration(dst, time); + + if (SUCCEEDED(IMFSample_GetSampleTime(src, &time))) + IMFSample_SetSampleTime(dst, time); + + if (SUCCEEDED(IMFSample_GetSampleFlags(src, &flags))) + IMFSample_SetSampleFlags(dst, flags); + + if (SUCCEEDED(IMFSample_ConvertToContiguousBuffer(src, NULL))) + { + if (SUCCEEDED(IMFSample_GetBufferByIndex(dst, 0, &buffer))) + { + if (FAILED(hr = IMFSample_CopyToBuffer(src, buffer))) + WARN("Failed to copy a buffer, hr %#x.\n", hr); + IMFMediaBuffer_Release(buffer); + } + } +} + +static void source_reader_set_sa_response(struct source_reader *reader, struct stream_response *response) +{ + struct media_stream *stream = &reader->streams[response->stream_index]; + IMFSample *sample; + + if (SUCCEEDED(IMFVideoSampleAllocatorEx_AllocateSample(stream->allocator, &sample))) + { + source_reader_copy_sample_buffer(response->sample, sample); + response->sa_pending = 0; + IMFSample_Release(response->sample); + response->sample = sample; + } +} + static void source_reader_queue_response(struct source_reader *reader, struct media_stream *stream, HRESULT status, DWORD stream_flags, LONGLONG timestamp, IMFSample *sample) { - struct source_reader_async_command *command; struct stream_response *response; - HRESULT hr; response = heap_alloc_zero(sizeof(*response)); response->status = status; @@ -381,27 +453,16 @@ static void source_reader_queue_response(struct source_reader *reader, struct me if (response->sample) IMFSample_AddRef(response->sample); + if (response->sample && stream->allocator) + { + response->sa_pending = 1; + source_reader_set_sa_response(reader, response); + } + list_add_tail(&reader->responses, &response->entry); stream->responses++; - if (stream->requests) - { - if (reader->async_callback) - { - if (SUCCEEDED(source_reader_create_async_op(SOURCE_READER_ASYNC_SAMPLE_READY, &command))) - { - command->u.sample.stream_index = stream->index; - if (FAILED(hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &reader->async_commands_callback, - &command->IUnknown_iface))) - WARN("Failed to submit async result, hr %#x.\n", hr); - IUnknown_Release(&command->IUnknown_iface); - } - } - else - WakeAllConditionVariable(&reader->sample_event); - - stream->requests--; - } + source_reader_response_ready(reader, response); } static HRESULT source_reader_request_sample(struct source_reader *reader, struct media_stream *stream) @@ -874,20 +935,26 @@ static struct stream_response * media_stream_detach_response(struct source_reade static struct stream_response *media_stream_pop_response(struct source_reader *reader, struct media_stream *stream) { struct stream_response *response; - struct list *head; - if (stream) + LIST_FOR_EACH_ENTRY(response, &reader->responses, struct stream_response, entry) { - LIST_FOR_EACH_ENTRY(response, &reader->responses, struct stream_response, entry) - { - if (response->stream_index == stream->index) - return media_stream_detach_response(reader, response); - } + if ((stream && response->stream_index != stream->index) || response->sa_pending) + continue; + + return media_stream_detach_response(reader, response); } - else + + return NULL; +} + +static struct stream_response *media_stream_pick_pending_response(struct source_reader *reader, unsigned int stream) +{ + struct stream_response *response; + + LIST_FOR_EACH_ENTRY(response, &reader->responses, struct stream_response, entry) { - if ((head = list_head(&reader->responses))) - return media_stream_detach_response(reader, LIST_ENTRY(head, struct stream_response, entry)); + if (response->stream_index == stream && response->sa_pending) + return response; } return NULL; @@ -963,7 +1030,7 @@ static BOOL source_reader_got_response_for_stream(struct source_reader *reader, LIST_FOR_EACH_ENTRY(response, &reader->responses, struct stream_response, entry) { - if (response->stream_index == stream->index) + if (response->stream_index == stream->index && !response->sa_pending) return TRUE; } @@ -1201,6 +1268,18 @@ static HRESULT WINAPI source_reader_async_commands_callback_Invoke(IMFAsyncCallb break; + case SOURCE_READER_ASYNC_SA_READY: + + EnterCriticalSection(&reader->cs); + if ((response = media_stream_pick_pending_response(reader, command->u.sa.stream_index))) + { + source_reader_set_sa_response(reader, response); + source_reader_response_ready(reader, response); + } + LeaveCriticalSection(&reader->cs); + + break; + case SOURCE_READER_ASYNC_SAMPLE_READY: EnterCriticalSection(&reader->cs); -- 2.30.0

1 0