January 2022 - Wine-commits

Rémi Bernon : mf/tests: Add some WMA decoder GetInputAvailableType tests.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: e074f3db1e8c7587f7a4c3c9eb5c655721e78553 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e074f3db1e8c7587f7a4c3c9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 24 10:55:37 2022 +0100 mf/tests: Add some WMA decoder GetInputAvailableType tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 10f5afc39ed..43249d114c9 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -112,6 +112,43 @@ typedef struct attribute_desc media_type_desc[32]; #define ATTR_UINT32(k, v) {.key = &k, .name = #k, {.vt = VT_UI4, .ulVal = v}} #define ATTR_BLOB(k, p, n) {.key = &k, .name = #k, {.vt = VT_VECTOR | VT_UI1, .caub = {.pElems = (void *)p, .cElems = n}}} +#define check_media_type(a, b, c) check_attributes_(__LINE__, (IMFAttributes *)a, b, c) +#define check_attributes(a, b, c) check_attributes_(__LINE__, a, b, c) +static void check_attributes_(int line, IMFAttributes *attributes, const struct attribute_desc *desc, ULONG limit) +{ + char buffer[256], *buf = buffer; + PROPVARIANT value; + int i, j, ret; + HRESULT hr; + + for (i = 0; i < limit && desc[i].key; ++i) + { + hr = IMFAttributes_GetItem(attributes, desc[i].key, &value); + ok_(__FILE__, line)(hr == S_OK, "%s missing, hr %#x\n", debugstr_a(desc[i].name), hr); + if (hr != S_OK) continue; + + switch (value.vt) + { + default: sprintf(buffer, "??"); break; + case VT_CLSID: sprintf(buffer, "%s", debugstr_guid(value.puuid)); break; + case VT_UI4: sprintf(buffer, "%u", value.ulVal); break; + case VT_VECTOR | VT_UI1: + buf += sprintf(buf, "size %u, data {", value.caub.cElems); + for (j = 0; j < 16 && j < value.caub.cElems; ++j) + buf += sprintf(buf, "0x%02x,", value.caub.pElems[i + j]); + if (value.caub.cElems > 16) + buf += sprintf(buf, "...}"); + else + buf += sprintf(buf - (j ? 1 : 0), "}"); + break; + } + + ret = PropVariantCompareEx(&value, &desc[i].value, 0, 0); + ok_(__FILE__, line)(ret == 0, "%s mismatch, type %u, value %s\n", + debugstr_a(desc[i].name), value.vt, buffer); + } +} + static HWND create_window(void) { RECT r = {0, 0, 640, 480}; @@ -5614,6 +5651,30 @@ static void test_wma_decoder(void) }, }; + static const media_type_desc expect_available_inputs[] = + { + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MEDIASUBTYPE_MSAUDIO1), + ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_WMAudioV8), + ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_WMAudioV9), + ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_WMAudio_Lossless), + ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), + }, + }; + const struct attribute_desc input_type_desc[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), @@ -5655,6 +5716,25 @@ static void test_wma_decoder(void) todo_wine check_interface(transform, &IID_IMediaObject, TRUE); + /* check default media types */ + + i = -1; + while (SUCCEEDED(hr = IMFTransform_GetInputAvailableType(transform, 0, ++i, &media_type))) + { + winetest_push_context("in %u", i); + ok(hr == S_OK, "GetInputAvailableType returned %#x\n", hr); + check_media_type(media_type, expect_available_inputs[i], -1); + hr = IMFTransform_SetInputType(transform, 0, media_type, 0); + ok(hr == MF_E_INVALIDMEDIATYPE, "SetInputType returned %#x.\n", hr); + ret = IMFMediaType_Release(media_type); + ok(ret == 0, "Release returned %u\n", ret); + winetest_pop_context(); + } + todo_wine + ok(hr == MF_E_NO_MORE_TYPES, "GetInputAvailableType returned %#x\n", hr); + todo_wine + ok(i == 4, "%u input media types\n", i); + /* setting output media type first doesn't work */ hr = MFCreateMediaType(&media_type);

1 0

Rémi Bernon : mf/tests: Add some WMA decoder GetOutputAvailableType tests.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 2a0726660798169f5ea7ba17396393203f5d7d73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a0726660798169f5ea7ba17… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 24 10:55:38 2022 +0100 mf/tests: Add some WMA decoder GetOutputAvailableType tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 43249d114c9..8b3e0dd65b2 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5674,6 +5674,33 @@ static void test_wma_decoder(void) ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), }, }; + static const media_type_desc expect_available_outputs[] = + { + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_Float), + ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 32), + ATTR_UINT32(MF_MT_AUDIO_NUM_CHANNELS, 2), + ATTR_UINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, 22050), + ATTR_UINT32(MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 176400), + ATTR_UINT32(MF_MT_AUDIO_BLOCK_ALIGNMENT, 8), + ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), + ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), + ATTR_UINT32(MF_MT_AUDIO_PREFER_WAVEFORMATEX, 1), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_PCM), + ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 16), + ATTR_UINT32(MF_MT_AUDIO_NUM_CHANNELS, 2), + ATTR_UINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, 22050), + ATTR_UINT32(MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 88200), + ATTR_UINT32(MF_MT_AUDIO_BLOCK_ALIGNMENT, 4), + ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), + ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), + ATTR_UINT32(MF_MT_AUDIO_PREFER_WAVEFORMATEX, 1), + }, + }; const struct attribute_desc input_type_desc[] = { @@ -5718,6 +5745,10 @@ static void test_wma_decoder(void) /* check default media types */ + hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); + todo_wine + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputAvailableType returned %#x\n", hr); + i = -1; while (SUCCEEDED(hr = IMFTransform_GetInputAvailableType(transform, 0, ++i, &media_type))) { @@ -5771,6 +5802,23 @@ static void test_wma_decoder(void) ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %u\n", ret); + /* check new output media types */ + + i = -1; + while (SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(transform, 0, ++i, &media_type))) + { + winetest_push_context("out %u", i); + ok(hr == S_OK, "GetOutputAvailableType returned %#x\n", hr); + check_media_type(media_type, expect_available_outputs[i], -1); + ret = IMFMediaType_Release(media_type); + ok(ret == 0, "Release returned %u\n", ret); + winetest_pop_context(); + } + todo_wine + ok(hr == MF_E_NO_MORE_TYPES, "GetOutputAvailableType returned %#x\n", hr); + todo_wine + ok(i == 2, "%u output media types\n", i); + /* check required output media type attributes */ hr = MFCreateMediaType(&media_type);

1 0

Robert Wilhelm : scrrun: Add test for GetTempName.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: a893207c719f78532c18d7c741c8bd74b46dbc9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a893207c719f78532c18d7c7… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Mon Jan 24 21:41:13 2022 +0100 scrrun: Add test for GetTempName. Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/tests/filesystem.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 8b06dbb883d..1886c52d009 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -472,6 +472,20 @@ static void test_GetFileName(void) } } +static void test_GetTempName(void) +{ + BSTR result; + HRESULT hr; + + hr = IFileSystem3_GetTempName(fs3, NULL); + ok(hr == E_POINTER, "GetTempName returned %x, expected E_POINTER\n", hr); + result = (BSTR)0xdeadbeef; + hr = IFileSystem3_GetTempName(fs3, &result); + ok(hr == S_OK, "GetTempName returned %x, expected S_OK\n", hr); + todo_wine ok(!!wcsstr( result,L".tmp"), "GetTempName returned %s, expected .tmp suffix\n", debugstr_w(result)); + SysFreeString(result); +} + static void test_GetBaseName(void) { static const struct @@ -2598,6 +2612,7 @@ START_TEST(filesystem) test_GetBaseName(); test_GetAbsolutePathName(); test_GetFile(); + test_GetTempName(); test_CopyFolder(); test_BuildPath(); test_GetFolder();

1 0

Robert Wilhelm : scrrun: Generate temp name with tmp suffix.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: f4d40a7379133e355004c731e2a397e888196db1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4d40a7379133e355004c731… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Mon Jan 24 21:41:20 2022 +0100 scrrun: Generate temp name with tmp suffix. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52163 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/filesystem.c | 4 ++-- dlls/scrrun/tests/filesystem.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 7b0b2e110a6..5d7d42850ab 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3318,12 +3318,12 @@ static HRESULT WINAPI filesys_GetTempName(IFileSystem3 *iface, BSTR *result) if (!result) return E_POINTER; - if (!(*result = SysAllocStringLen(NULL, 12))) + if (!(*result = SysAllocStringLen(NULL, 13))) return E_OUTOFMEMORY; if(!RtlGenRandom(&random, sizeof(random))) return E_FAIL; - swprintf(*result, 12, L"rad%05X.txt", random & 0xfffff); + swprintf(*result, 13, L"rad%05X.tmp", random & 0xfffff); return S_OK; } diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 1886c52d009..da1ca316382 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -482,7 +482,7 @@ static void test_GetTempName(void) result = (BSTR)0xdeadbeef; hr = IFileSystem3_GetTempName(fs3, &result); ok(hr == S_OK, "GetTempName returned %x, expected S_OK\n", hr); - todo_wine ok(!!wcsstr( result,L".tmp"), "GetTempName returned %s, expected .tmp suffix\n", debugstr_w(result)); + ok(!!wcsstr( result,L".tmp"), "GetTempName returned %s, expected .tmp suffix\n", debugstr_w(result)); SysFreeString(result); }

1 0

Nikolay Sivov : d3d10/effect: Fix iteration in GetBackingStore() for depth stencil states.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 5639edd26ebf90e93ad0f0688641fcac01f88d1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5639edd26ebf90e93ad0f068… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 21 10:26:23 2022 +0300 d3d10/effect: Fix iteration in GetBackingStore() for depth stencil states. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 11 +++++------ dlls/d3d10/tests/effect.c | 2 ++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index a6a1189be20..3198ad5a575 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -8796,21 +8796,20 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_depth_stencil_variable_GetBackingS TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); - if (v->type->element_count) - v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); - - if (v->type->basetype != D3D10_SVT_DEPTHSTENCIL) + if (!iface->lpVtbl->IsValid(iface)) { - WARN("Variable is not a depth stencil state.\n"); + WARN("Invalid variable.\n"); return E_FAIL; } + if (!(v = d3d10_get_state_variable(v, index, &v->effect->ds_states))) + return E_FAIL; + *desc = v->u.state.desc.depth_stencil; return S_OK; } - static const struct ID3D10EffectDepthStencilVariableVtbl d3d10_effect_depth_stencil_variable_vtbl = { /* ID3D10EffectVariable methods */ diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 418747b5df5..93ad4d8a475 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -4548,6 +4548,8 @@ static void test_effect_state_groups(void) ds_desc.BackFace.StencilPassOp); ok(ds_desc.BackFace.StencilFunc == D3D10_COMPARISON_GREATER_EQUAL, "Got unexpected BackFaceStencilFunc %#x.\n", ds_desc.BackFace.StencilFunc); + d->lpVtbl->GetBackingStore(d, 1, &ds_desc); + ok(!ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); v = effect->lpVtbl->GetVariableByName(effect, "rast_state"); r = v->lpVtbl->AsRasterizer(v);

1 0

Nikolay Sivov : d3d10/effect: Fix iteration in GetBackingStore() for rasterizer states.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 3ec149232cb3d34ff63147e1742cbd7bddec9922 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ec149232cb3d34ff63147e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 21 10:26:24 2022 +0300 d3d10/effect: Fix iteration in GetBackingStore() for rasterizer states. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 11 +++++------ dlls/d3d10/tests/effect.c | 2 ++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3198ad5a575..daca3379fde 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -9037,21 +9037,20 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_rasterizer_variable_GetBackingStor TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); - if (v->type->element_count) - v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); - - if (v->type->basetype != D3D10_SVT_RASTERIZER) + if (!iface->lpVtbl->IsValid(iface)) { - WARN("Variable is not a rasterizer state.\n"); + WARN("Invalid variable.\n"); return E_FAIL; } + if (!(v = d3d10_get_state_variable(v, index, &v->effect->rs_states))) + return E_FAIL; + *desc = v->u.state.desc.rasterizer; return S_OK; } - static const struct ID3D10EffectRasterizerVariableVtbl d3d10_effect_rasterizer_variable_vtbl = { /* ID3D10EffectVariable methods */ diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 93ad4d8a475..84a2abcb4d9 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -4567,6 +4567,8 @@ static void test_effect_state_groups(void) ok(rast_desc.MultisampleEnable, "Got unexpected MultisampleEnable %#x.\n", rast_desc.MultisampleEnable); ok(rast_desc.AntialiasedLineEnable, "Got unexpected AntialiasedLineEnable %#x.\n", rast_desc.AntialiasedLineEnable); + r->lpVtbl->GetBackingStore(r, 1, &rast_desc); + ok(rast_desc.CullMode == D3D10_CULL_BACK, "Got unexpected CullMode %#x.\n", rast_desc.CullMode); technique = effect->lpVtbl->GetTechniqueByName(effect, "tech0"); ok(technique->lpVtbl->IsValid(technique), "Expected valid technique.\n");

1 0

Nikolay Sivov : d3d10/effect: Fix index access in GetSampler().
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 9fc481c3e2654d6a7fca53fefdc725e21b221586 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fc481c3e2654d6a7fca53fe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 21 10:26:25 2022 +0300 d3d10/effect: Fix index access in GetSampler(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 12 +++++------- dlls/d3d10/tests/effect.c | 11 +++++++++++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index daca3379fde..6fec572d692 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -9254,17 +9254,15 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetSampler(ID3D10 TRACE("iface %p, index %u, sampler %p.\n", iface, index, sampler); - if (v->type->element_count) - v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); - else if (index) - return E_FAIL; - - if (v->type->basetype != D3D10_SVT_SAMPLER) + if (!iface->lpVtbl->IsValid(iface)) { - WARN("Variable is not a sampler state.\n"); + WARN("Invalid variable.\n"); return E_FAIL; } + if (!(v = d3d10_get_state_variable(v, index, &v->effect->samplers))) + return E_FAIL; + if ((*sampler = v->u.state.object.sampler)) ID3D10SamplerState_AddRef(*sampler); diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 84a2abcb4d9..5ca6b539524 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -4446,6 +4446,7 @@ static void test_effect_state_groups(void) ID3D10EffectBlendVariable *b; D3D10_BLEND_DESC blend_desc; D3D10_STATE_BLOCK_MASK mask; + ID3D10SamplerState *sampler; D3D10_PASS_DESC pass_desc; ID3D10EffectVariable *v; ID3D10EffectPass *pass; @@ -4496,9 +4497,19 @@ static void test_effect_state_groups(void) ok(sampler_desc.BorderColor[3] == 4.0f, "Got unexpected BorderColor[3] %.8e.\n", sampler_desc.BorderColor[3]); ok(sampler_desc.MinLOD == 6.0f, "Got unexpected MinLOD %.8e.\n", sampler_desc.MinLOD); ok(sampler_desc.MaxLOD == 5.0f, "Got unexpected MaxLOD %.8e.\n", sampler_desc.MaxLOD); + hr = s->lpVtbl->GetSampler(s, 0, &sampler); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10SamplerState_GetDesc(sampler, &sampler_desc); + ok(sampler_desc.Filter == D3D10_FILTER_MIN_MAG_MIP_LINEAR, "Got unexpected Filter %#x.\n", sampler_desc.Filter); + ID3D10SamplerState_Release(sampler); s->lpVtbl->GetBackingStore(s, 1, &sampler_desc); ok(sampler_desc.AddressU == D3D10_TEXTURE_ADDRESS_MIRROR, "Got unexpected AddressU %#x.\n", sampler_desc.AddressU); + hr = s->lpVtbl->GetSampler(s, 1, &sampler); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10SamplerState_GetDesc(sampler, &sampler_desc); + ok(sampler_desc.AddressU == D3D10_TEXTURE_ADDRESS_MIRROR, "Got unexpected AddressU %#x.\n", sampler_desc.AddressU); + ID3D10SamplerState_Release(sampler); v = effect->lpVtbl->GetVariableByName(effect, "blend_state"); b = v->lpVtbl->AsBlend(v);

1 0

Nikolay Sivov : d3d10/effect: Fix index access in GetRasterizerState().
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 2149beff79f8d13cf5888cc080230ec40047d15f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2149beff79f8d13cf5888cc0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 21 10:26:26 2022 +0300 d3d10/effect: Fix index access in GetRasterizerState(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 12 +++++------- dlls/d3d10/tests/effect.c | 11 +++++++++++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 6fec572d692..fb6c1ed58ad 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -9013,17 +9013,15 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_rasterizer_variable_GetRasterizerS TRACE("iface %p, index %u, rasterizer_state %p.\n", iface, index, rasterizer_state); - if (v->type->element_count) - v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); - else if (index) - return E_FAIL; - - if (v->type->basetype != D3D10_SVT_RASTERIZER) + if (!iface->lpVtbl->IsValid(iface)) { - WARN("Variable is not a rasterizer state.\n"); + WARN("Invalid variable.\n"); return E_FAIL; } + if (!(v = d3d10_get_state_variable(v, index, &v->effect->rs_states))) + return E_FAIL; + if ((*rasterizer_state = v->u.state.object.rasterizer)) ID3D10RasterizerState_AddRef(*rasterizer_state); diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 5ca6b539524..32a154bf276 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -4578,8 +4578,19 @@ static void test_effect_state_groups(void) ok(rast_desc.MultisampleEnable, "Got unexpected MultisampleEnable %#x.\n", rast_desc.MultisampleEnable); ok(rast_desc.AntialiasedLineEnable, "Got unexpected AntialiasedLineEnable %#x.\n", rast_desc.AntialiasedLineEnable); + hr = r->lpVtbl->GetRasterizerState(r, 0, &rast_state); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10RasterizerState_GetDesc(rast_state, &rast_desc); + ok(rast_desc.CullMode == D3D10_CULL_FRONT, "Got unexpected CullMode %#x.\n", rast_desc.CullMode); + ID3D10RasterizerState_Release(rast_state); + r->lpVtbl->GetBackingStore(r, 1, &rast_desc); ok(rast_desc.CullMode == D3D10_CULL_BACK, "Got unexpected CullMode %#x.\n", rast_desc.CullMode); + hr = r->lpVtbl->GetRasterizerState(r, 1, &rast_state); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10RasterizerState_GetDesc(rast_state, &rast_desc); + ok(rast_desc.CullMode == D3D10_CULL_BACK, "Got unexpected CullMode %#x.\n", rast_desc.CullMode); + ID3D10RasterizerState_Release(rast_state); technique = effect->lpVtbl->GetTechniqueByName(effect, "tech0"); ok(technique->lpVtbl->IsValid(technique), "Expected valid technique.\n");

1 0

Florian Will : gdiplus: Disable PNG encoding filters.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 6090276b3eadcf22470b68a77a69736e36da0622 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6090276b3eadcf22470b68a7… Author: Florian Will <florian.will(a)gmail.com> Date: Mon Jan 24 10:49:39 2022 +0100 gdiplus: Disable PNG encoding filters. This speeds up the encoding process, sometimes at the cost of increased PNG file sizes. PNGs created using gdiplus on Windows 10 have filters disabled, too, according to pngcheck. The application "ZusiDisplay" encodes finished frames in PNG format and sends them through a named pipe for "Zusi 3" to use as an in-game texture, so performance matters for that use case to improve "embedded display" FPS. Signed-off-by: Florian Will <florian.will(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/Makefile.in | 2 +- dlls/gdiplus/image.c | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in index ac12bd1c613..c87ec5ba827 100644 --- a/dlls/gdiplus/Makefile.in +++ b/dlls/gdiplus/Makefile.in @@ -1,6 +1,6 @@ MODULE = gdiplus.dll IMPORTLIB = gdiplus -IMPORTS = uuid shlwapi ole32 user32 gdi32 +IMPORTS = uuid shlwapi ole32 oleaut32 user32 gdi32 DELAYIMPORTS = windowscodecs C_SRCS = \ diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 518a9bf8689..56eb62392ec 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4544,6 +4544,7 @@ static GpStatus encode_frame_wic(IWICBitmapEncoder *encoder, GpImage *image) GpBitmap *bitmap; IWICBitmapFrameEncode *frameencode; IPropertyBag2 *encoderoptions; + GUID container_format; HRESULT hr; UINT width, height; PixelFormat gdipformat=0; @@ -4570,7 +4571,20 @@ static GpStatus encode_frame_wic(IWICBitmapEncoder *encoder, GpImage *image) if (SUCCEEDED(hr)) /* created frame */ { - hr = IWICBitmapFrameEncode_Initialize(frameencode, encoderoptions); + hr = IWICBitmapEncoder_GetContainerFormat(encoder, &container_format); + if (SUCCEEDED(hr) && IsEqualGUID(&container_format, &GUID_ContainerFormatPng)) + { + /* disable PNG filters for faster encoding */ + PROPBAG2 filter_option = { .pstrName = (LPOLESTR) L"FilterOption" }; + VARIANT filter_value; + VariantInit(&filter_value); + V_VT(&filter_value) = VT_UI1; + V_UI1(&filter_value) = WICPngFilterNone; + hr = IPropertyBag2_Write(encoderoptions, 1, &filter_option, &filter_value); + } + + if (SUCCEEDED(hr)) + hr = IWICBitmapFrameEncode_Initialize(frameencode, encoderoptions); if (SUCCEEDED(hr)) hr = IWICBitmapFrameEncode_SetSize(frameencode, width, height);

1 0

Louis Lenders : ole32: Add stub for OleConvertIStorageToOLESTREAMEx.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 18e331fd63173b3f3fe00e930e3e09aad94493a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18e331fd63173b3f3fe00e93… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Jan 21 10:06:59 2022 +0100 ole32: Add stub for OleConvertIStorageToOLESTREAMEx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52298 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole32.spec | 2 +- dlls/ole32/storage32.c | 11 +++++++++++ include/ole2.h | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index d9ffd63585c..e9982036eeb 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -187,7 +187,7 @@ @ stdcall Ole32DllGetClassObject(ptr ptr ptr) @ stdcall OleBuildVersion() @ stdcall OleConvertIStorageToOLESTREAM(ptr ptr) -@ stub OleConvertIStorageToOLESTREAMEx +@ stdcall OleConvertIStorageToOLESTREAMEx(ptr long long long long ptr ptr) @ stdcall OleConvertOLESTREAMToIStorage(ptr ptr ptr) @ stub OleConvertOLESTREAMToIStorageEx @ stdcall OleCreate(ptr ptr long ptr ptr ptr ptr) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 1bc8455cc6b..06766a28fe7 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -10570,6 +10570,17 @@ enum stream_1ole_flags { OleStream_Convert = 0x00000004 }; +/************************************************************************* + * OleConvertIStorageToOLESTREAMEx [OLE32.@] + */ +HRESULT WINAPI OleConvertIStorageToOLESTREAMEx ( LPSTORAGE stg, CLIPFORMAT cf, LONG width, LONG height, + DWORD size, LPSTGMEDIUM medium, LPOLESTREAM olestream ) +{ + FIXME("%p %x %d %d %d %p %p stub\n", stg, cf, width, height, size, medium, olestream); + + return E_NOTIMPL; +} + /*********************************************************************** * GetConvertStg (OLE32.@) */ diff --git a/include/ole2.h b/include/ole2.h index 05c1b5502c7..628bebae137 100644 --- a/include/ole2.h +++ b/include/ole2.h @@ -161,6 +161,8 @@ typedef struct _OLESTREAM { HRESULT WINAPI OleConvertOLESTREAMToIStorage( LPOLESTREAM lpolestream, LPSTORAGE pstg, const DVTARGETDEVICE* ptd); HRESULT WINAPI OleConvertIStorageToOLESTREAM( LPSTORAGE pstg, LPOLESTREAM lpolestream); +HRESULT WINAPI OleConvertIStorageToOLESTREAMEx( LPSTORAGE stg, CLIPFORMAT cf, LONG width, LONG height, + DWORD size, LPSTGMEDIUM medium, LPOLESTREAM olestream ); HRESULT WINAPI OleDoAutoConvert( LPSTORAGE pStg, LPCLSID pClsidNew ); HRESULT WINAPI OleGetAutoConvert( REFCLSID clsidOld, LPCLSID pClsidNew );

1 0