October 2021 - Wine-Commits

Ziqing Hui : d3dx10/tests: Add tests for D3DX10CreateTextureFromResource{A, W}.
by Alexandre Julliard Oct. 27, 2021

Oct. 27, 2021

Module: wine Branch: master Commit: 1a35f589c33b367f55af32eaa6e8b37eff8a4d8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a35f589c33b367f55af32ea… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Oct 26 23:15:54 2021 +0200 d3dx10/tests: Add tests for D3DX10CreateTextureFromResource{A, W}. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 49 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 87c06f97780..13f70f34f96 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1974,8 +1974,10 @@ static void test_get_image_info(void) static void test_create_texture(void) { + static const WCHAR test_resource_name[] = L"resource.data"; static const WCHAR test_filename[] = L"image.data"; ID3D10Resource *resource; + HMODULE resource_module; ID3D10Device *device; WCHAR path[MAX_PATH]; unsigned int i; @@ -2075,6 +2077,53 @@ static void test_create_texture(void) winetest_pop_context(); } + /* D3DX10CreateTextureFromResource tests */ + + todo_wine + { + hr = D3DX10CreateTextureFromResourceW(device, NULL, NULL, NULL, NULL, &resource, NULL); + ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); + hr = D3DX10CreateTextureFromResourceW(device, NULL, L"deadbeef", NULL, NULL, &resource, NULL); + ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); + hr = D3DX10CreateTextureFromResourceA(device, NULL, NULL, NULL, NULL, &resource, NULL); + ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); + hr = D3DX10CreateTextureFromResourceA(device, NULL, "deadbeef", NULL, NULL, &resource, NULL); + ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); + } + + for (i = 0; i < ARRAY_SIZE(test_image); ++i) + { + winetest_push_context("Test %u", i); + resource_module = create_resource_module(test_resource_name, test_image[i].data, test_image[i].size); + + hr = D3DX10CreateTextureFromResourceW(device, resource_module, + test_resource_name, NULL, NULL, &resource, NULL); + todo_wine + ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + { + check_resource_info(resource, test_image + i, __LINE__); + check_resource_data(resource, test_image + i, __LINE__); + ID3D10Resource_Release(resource); + } + + hr = D3DX10CreateTextureFromResourceA(device, resource_module, + get_str_a(test_resource_name), NULL, NULL, &resource, NULL); + todo_wine + ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + { + check_resource_info(resource, test_image + i, __LINE__); + check_resource_data(resource, test_image + i, __LINE__); + ID3D10Resource_Release(resource); + } + + delete_resource_module(test_resource_name, resource_module); + winetest_pop_context(); + } + CoUninitialize(); ID3D10Device_Release(device);

1 0

Nikolay Sivov : d3d10/effect: Use data_size of the variable as buffer size.
by Alexandre Julliard Oct. 27, 2021

Oct. 27, 2021

Module: wine Branch: master Commit: 74e007175fa0ac47a4a64abbf8c12de82611a672 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74e007175fa0ac47a4a64abb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 26 23:25:09 2021 +0200 d3d10/effect: Use data_size of the variable as buffer size. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3ceb1a1fbb3..dd8efedad45 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2354,13 +2354,13 @@ static HRESULT create_variable_buffer(struct d3d10_effect_variable *v) ID3D10Device *device = v->effect->device; HRESULT hr; - if (!(v->u.buffer.local_buffer = heap_alloc_zero(v->type->size_unpacked))) + if (!(v->u.buffer.local_buffer = heap_alloc_zero(v->data_size))) { ERR("Failed to allocate local constant buffer memory.\n"); return E_OUTOFMEMORY; } - buffer_desc.ByteWidth = v->type->size_unpacked; + buffer_desc.ByteWidth = v->data_size; buffer_desc.Usage = D3D10_USAGE_DEFAULT; buffer_desc.CPUAccessFlags = 0; buffer_desc.MiscFlags = 0; @@ -2579,7 +2579,7 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char TRACE("\tBasetype: %s.\n", debug_d3d10_shader_variable_type(l->type->basetype)); TRACE("\tTypeclass: %s.\n", debug_d3d10_shader_variable_class(l->type->type_class)); - if (local && l->type->size_unpacked) + if (local && l->data_size) { if (FAILED(hr = create_variable_buffer(l))) return hr;

1 0

Nikolay Sivov : d3dx9/tests: Add some tests for constant descriptions in texture shaders.
by Alexandre Julliard Oct. 27, 2021

Oct. 27, 2021

Module: wine Branch: master Commit: db1361ebb00bd0e755426270436bc1f7182f4860 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db1361ebb00bd0e755426270… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 19 09:04:02 2021 +0300 d3dx9/tests: Add some tests for constant descriptions in texture shaders. 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/d3dx9_36/tests/texture.c | 191 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 189 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=db1361ebb00bd0e75542…

1 0

Ziqing Hui : d3dx10/tests: Add tests for D3DX10CreateTextureFromFile{A, W}.
by Alexandre Julliard Oct. 27, 2021

Oct. 27, 2021

Module: wine Branch: master Commit: 133fa91a8128787826b36c3f299a8bfd782f6f35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=133fa91a8128787826b36c3f… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Oct 26 23:15:53 2021 +0200 d3dx10/tests: Add tests for D3DX10CreateTextureFromFile{A, W}. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 47 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 84a644cb55d..87c06f97780 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1974,8 +1974,10 @@ static void test_get_image_info(void) static void test_create_texture(void) { + static const WCHAR test_filename[] = L"image.data"; ID3D10Resource *resource; ID3D10Device *device; + WCHAR path[MAX_PATH]; unsigned int i; HRESULT hr; @@ -2028,6 +2030,51 @@ static void test_create_texture(void) winetest_pop_context(); } + /* D3DX10CreateTextureFromFile tests */ + + todo_wine + { + hr = D3DX10CreateTextureFromFileW(device, NULL, NULL, NULL, &resource, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = D3DX10CreateTextureFromFileW(device, L"deadbeef", NULL, NULL, &resource, NULL); + ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + hr = D3DX10CreateTextureFromFileA(device, NULL, NULL, NULL, &resource, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = D3DX10CreateTextureFromFileA(device, "deadbeef", NULL, NULL, &resource, NULL); + ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + } + + for (i = 0; i < ARRAY_SIZE(test_image); ++i) + { + winetest_push_context("Test %u", i); + create_file(test_filename, test_image[i].data, test_image[i].size, path); + + hr = D3DX10CreateTextureFromFileW(device, path, NULL, NULL, &resource, NULL); + todo_wine + ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + { + check_resource_info(resource, test_image + i, __LINE__); + check_resource_data(resource, test_image + i, __LINE__); + ID3D10Resource_Release(resource); + } + + hr = D3DX10CreateTextureFromFileA(device, get_str_a(path), NULL, NULL, &resource, NULL); + todo_wine + ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + { + check_resource_info(resource, test_image + i, __LINE__); + check_resource_data(resource, test_image + i, __LINE__); + ID3D10Resource_Release(resource); + } + + delete_file(test_filename); + winetest_pop_context(); + } + CoUninitialize(); ID3D10Device_Release(device);

1 0

Nikolay Sivov : d3d10/effect: Fix buffer offsets for members and array elements.
by Alexandre Julliard Oct. 27, 2021

Oct. 27, 2021

Module: wine Branch: master Commit: 59b01089a26ea463ff1cd6acd4f877c44da92aa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59b01089a26ea463ff1cd6ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 26 23:25:08 2021 +0200 d3d10/effect: Fix buffer offsets for members and array elements. 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 | 24 ++++++++++++++++++++++-- dlls/d3d10/tests/effect.c | 35 ++++++++++++++++++++++++++++++++--- 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 7590bba6317..3ceb1a1fbb3 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -21,6 +21,7 @@ #include "d3d10_private.h" #include <float.h> +#include <stdint.h> WINE_DEFAULT_DEBUG_CHANNEL(d3d10); @@ -2075,10 +2076,25 @@ static HRESULT parse_fx10_technique(const char *data, size_t data_size, return S_OK; } +static void d3d10_effect_variable_update_buffer_offsets(struct d3d10_effect_variable *v, + unsigned int offset) +{ + unsigned int i; + + for (i = 0; i < v->type->member_count; ++i) + d3d10_effect_variable_update_buffer_offsets(&v->members[i], offset); + + for (i = 0; i < v->type->element_count; ++i) + d3d10_effect_variable_update_buffer_offsets(&v->elements[i], offset); + + v->buffer_offset += offset; +} + static HRESULT parse_fx10_numeric_variable(const char *data, size_t data_size, const char **ptr, BOOL local, struct d3d10_effect_variable *v) { DWORD offset, flags, default_value_offset; + uint32_t buffer_offset; HRESULT hr; if (FAILED(hr = parse_fx10_variable_head(data, data_size, ptr, v))) @@ -2094,8 +2110,8 @@ static HRESULT parse_fx10_numeric_variable(const char *data, size_t data_size, } TRACE("Variable semantic: %s.\n", debugstr_a(v->semantic)); - read_dword(ptr, &v->buffer_offset); - TRACE("Variable offset in buffer: %#x.\n", v->buffer_offset); + read_dword(ptr, &buffer_offset); + TRACE("Variable offset in buffer: %#x.\n", buffer_offset); read_dword(ptr, &default_value_offset); @@ -2104,6 +2120,10 @@ static HRESULT parse_fx10_numeric_variable(const char *data, size_t data_size, v->flag |= flags; + /* At this point storage offsets for members and array elements are relative to containing + variable. Update them by moving to correct offset within a buffer. */ + d3d10_effect_variable_update_buffer_offsets(v, buffer_offset); + if (local) { if (default_value_offset) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index bd5392fcd16..2844386ef51 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -5126,16 +5126,17 @@ static void test_effect_scalar_variable(void) {"i_a", D3D10_SVT_INT, TRUE}, {"b_a", D3D10_SVT_BOOL, TRUE}, }; + ID3D10EffectScalarVariable *s_v, *s_v2; + ID3D10EffectVariable *var, *var2; D3D10_EFFECT_TYPE_DESC type_desc; D3D10_EFFECT_DESC effect_desc; - ID3D10EffectScalarVariable *s_v; - ID3D10EffectVariable *var; ID3D10EffectType *type; ID3D10Device *device; ID3D10Effect *effect; unsigned int i; ULONG refcount; HRESULT hr; + float f; if (!(device = create_device())) { @@ -5176,6 +5177,22 @@ static void test_effect_scalar_variable(void) test_scalar_array_methods(s_v, tests[i].type, tests[i].name); } + /* Verify that offsets are working correctly between array elements and adjacent data. */ + var = effect->lpVtbl->GetVariableByName(effect, "f0"); + s_v = var->lpVtbl->AsScalar(var); + hr = s_v->lpVtbl->SetFloat(s_v, 1.0f); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + var2 = effect->lpVtbl->GetVariableByName(effect, "f_a"); + var2 = var2->lpVtbl->GetElement(var2, 0); + s_v2 = var->lpVtbl->AsScalar(var2); + hr = s_v2->lpVtbl->SetFloat(s_v2, 2.0f); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = s_v->lpVtbl->GetFloat(s_v, &f); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(f == 1.0f, "Unexpected value %f.\n", f); + effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); @@ -7310,10 +7327,11 @@ static DWORD fx_test_default_variable_value[] = static void test_effect_default_variable_value(void) { + D3D10_EFFECT_VARIABLE_DESC var_desc; ID3D10EffectVectorVariable *vector; ID3D10EffectScalarVariable *scalar; + ID3D10EffectVariable *v, *v2; float float_v[4], float_s; - ID3D10EffectVariable *v; ID3D10Effect *effect; ID3D10Device *device; int int_v[2], int_s; @@ -7373,6 +7391,17 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); todo_wine ok(int_v[0] == 9 && int_v[1] == 12, "Unexpected vector {%d,%d}\n", int_v[0], int_v[1]); + hr = v->lpVtbl->GetDesc(v, &var_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(var_desc.BufferOffset == 32, "Unexpected offset %u.\n", var_desc.BufferOffset); + v2 = v->lpVtbl->GetElement(v, 0); + hr = v2->lpVtbl->GetDesc(v2, &var_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(var_desc.BufferOffset == 32, "Unexpected offset %u.\n", var_desc.BufferOffset); + v2 = v->lpVtbl->GetElement(v, 1); + hr = v2->lpVtbl->GetDesc(v2, &var_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(var_desc.BufferOffset == 48, "Unexpected offset %u.\n", var_desc.BufferOffset); float_s = 0.0f; v = effect->lpVtbl->GetVariableByName(effect, "f");

1 0

Nikolay Sivov : d3d10/effect: Return when effect creation fails.
by Alexandre Julliard Oct. 27, 2021

Oct. 27, 2021

Module: wine Branch: master Commit: c702e19903b1837dd9cbfec0a8562ba5a82ddf0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c702e19903b1837dd9cbfec0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 26 23:25:07 2021 +0200 d3d10/effect: Return when effect creation fails. 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3b4050460a0..7590bba6317 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -8551,6 +8551,7 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl if (FAILED(hr = d3d10_create_effect(data, data_size, device, pool, 0, &object))) { WARN("Failed to create an effect, hr %#x.\n", hr); + return hr; } *effect = &object->ID3D10Effect_iface;

1 0

Matteo Bruni : d3dx10/tests: Only accept D3DX10_IFF_WMP tests failure on Windows.
by Alexandre Julliard Oct. 27, 2021

Oct. 27, 2021

Module: wine Branch: master Commit: ba149e129636cfe25955eff5608c511556d88c6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba149e129636cfe25955eff5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 26 23:15:52 2021 +0200 d3dx10/tests: Only accept D3DX10_IFF_WMP tests failure on Windows. Since eb0180e7b4df18d806ceb31e4a96e9a771b4db3e we're guaranteed to have support for the format in Wine. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 70827056f5f..84a644cb55d 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1896,7 +1896,7 @@ static void test_get_image_info(void) winetest_push_context("Test %u", i); hr = D3DX10GetImageInfoFromMemory(test_image[i].data, test_image[i].size, NULL, &image_info, NULL); - ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), "Got unexpected hr %#x.\n", hr); if (hr == S_OK) check_image_info(&image_info, test_image + i, __LINE__); @@ -1919,13 +1919,13 @@ static void test_get_image_info(void) create_file(test_filename, test_image[i].data, test_image[i].size, path); hr = D3DX10GetImageInfoFromFileW(path, NULL, &image_info, NULL); - ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), "Got unexpected hr %#x.\n", hr); if (hr == S_OK) check_image_info(&image_info, test_image + i, __LINE__); hr = D3DX10GetImageInfoFromFileA(get_str_a(path), NULL, &image_info, NULL); - ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), "Got unexpected hr %#x.\n", hr); if (hr == S_OK) check_image_info(&image_info, test_image + i, __LINE__); @@ -1952,14 +1952,14 @@ static void test_get_image_info(void) resource_module = create_resource_module(test_resource_name, test_image[i].data, test_image[i].size); hr = D3DX10GetImageInfoFromResourceW(resource_module, test_resource_name, NULL, &image_info, NULL); - ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP) + ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP) || broken(hr == D3DX10_ERR_INVALID_DATA) /* Vista */, "Got unexpected hr %#x.\n", hr); if (hr == S_OK) check_image_info(&image_info, test_image + i, __LINE__); hr = D3DX10GetImageInfoFromResourceA(resource_module, get_str_a(test_resource_name), NULL, &image_info, NULL); - ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP) + ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP) || broken(hr == D3DX10_ERR_INVALID_DATA) /* Vista */, "Got unexpected hr %#x.\n", hr); if (hr == S_OK) @@ -2016,7 +2016,7 @@ static void test_create_texture(void) hr = D3DX10CreateTextureFromMemory(device, test_image[i].data, test_image[i].size, NULL, NULL, &resource, NULL); todo_wine_if(test_image[i].expected_info.MiscFlags & D3D10_RESOURCE_MISC_TEXTURECUBE) - ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), "Got unexpected hr %#x.\n", hr); if (hr == S_OK) {

1 0

Nikolay Sivov : mfplay: Trace normalized rectangle arguments.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: master Commit: cd36dd31056c89a7a213e35032e2cc2288957cdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd36dd31056c89a7a213e350… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 26 19:59:15 2021 +0300 mfplay: Trace normalized rectangle arguments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 6f8d4942a0b..12ea653b97d 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -53,6 +53,12 @@ static void platform_shutdown(void) MFShutdown(); } +static inline const char *debugstr_normalized_rect(const MFVideoNormalizedRect *rect) +{ + if (!rect) return "(null)"; + return wine_dbg_sprintf("(%.8e,%.8e)-(%.8e,%.8e)", rect->left, rect->top, rect->right, rect->bottom); +} + struct media_item { IMFPMediaItem IMFPMediaItem_iface; @@ -1437,7 +1443,7 @@ static HRESULT WINAPI media_player_SetVideoSourceRect(IMFPMediaPlayer *iface, RECT dst_rect; HRESULT hr; - TRACE("%p, %p.\n", iface, rect); + TRACE("%p, %s.\n", iface, debugstr_normalized_rect(rect)); if (!GetClientRect(player->output_window, &dst_rect)) hr = HRESULT_FROM_WIN32(GetLastError());

1 0

Paul Gofman : ntdll: Fix alignment mask size in RtlInitializeExtendedContext2().
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: master Commit: e73bb07ff59d0d0b7925df3d642299689275b0a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e73bb07ff59d0d0b7925df3d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Oct 26 20:00:27 2021 +0300 ntdll: Fix alignment mask size in RtlInitializeExtendedContext2(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 3c499c4fa80..c3714e8369b 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -837,7 +837,7 @@ NTSTATUS WINAPI RtlInitializeExtendedContext2( void *context, ULONG context_flag if ((context_flags & 0x40) && !(supported_mask = RtlGetEnabledExtendedFeatures( ~(ULONG64)0 ))) return STATUS_NOT_SUPPORTED; - context = (void *)(((ULONG_PTR)context + p->true_alignment) & ~p->true_alignment); + context = (void *)(((ULONG_PTR)context + p->true_alignment) & ~(ULONG_PTR)p->true_alignment); *(ULONG *)((BYTE *)context + p->flags_offset) = context_flags; *context_ex = c_ex = (CONTEXT_EX *)((BYTE *)context + p->context_size);

1 0

Andrew Eikum : evr/presenter: Invalidate media type on destination rectangle change.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: master Commit: 7980d049e8e785a92631a74b0153eb716dd40ca8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7980d049e8e785a92631a74b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 26 19:58:31 2021 +0300 evr/presenter: Invalidate media type on destination rectangle change. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 8 +++++++- dlls/evr/tests/evr.c | 19 ++++++++++--------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index b8b18638185..5b262e7c663 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -1295,8 +1295,14 @@ static HRESULT WINAPI video_presenter_control_SetVideoPosition(IMFVideoDisplayCo video_presenter_set_mixer_rect(presenter); } } - if (dst_rect) + if (dst_rect && !EqualRect(dst_rect, &presenter->dst_rect)) + { presenter->dst_rect = *dst_rect; + hr = video_presenter_invalidate_media_type(presenter); + /* Mixer's input type hasn't been configured yet, this is not an error. */ + if (hr == MF_E_TRANSFORM_TYPE_NOT_SET) hr = S_OK; + /* FIXME: trigger repaint */ + } } LeaveCriticalSection(&presenter->cs); diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 01edda7bc9b..5bf03fa49f8 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -2190,9 +2190,6 @@ static void test_presenter_media_type(void) hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)manager); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IMFTransform_SetInputType(mixer, 0, input_type, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -2204,12 +2201,20 @@ static void test_presenter_media_type(void) hr = IMFVideoDisplayControl_SetVideoWindow(display_control, window); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + /* Set destination rectangle before mixer types are configured. */ + SetRect(&dst, 0, 0, 101, 51); + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &dst); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetInputType(mixer, 0, input_type, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); get_output_aperture(mixer, &frame_size, &aperture); - ok(frame_size.cx == 100 && frame_size.cy == 50, "Unexpected frame size %u x %u.\n", frame_size.cx, frame_size.cy); - ok(aperture.Area.cx == 100 && aperture.Area.cy == 50, "Unexpected size %u x %u.\n", aperture.Area.cx, aperture.Area.cy); + ok(frame_size.cx == 101 && frame_size.cy == 51, "Unexpected frame size %u x %u.\n", frame_size.cx, frame_size.cy); + ok(aperture.Area.cx == 101 && aperture.Area.cy == 51, "Unexpected size %u x %u.\n", aperture.Area.cx, aperture.Area.cy); ok(!aperture.OffsetX.value && !aperture.OffsetX.fract && !aperture.OffsetY.value && !aperture.OffsetY.fract, "Unexpected offset %u x %u.\n", aperture.OffsetX.value, aperture.OffsetY.value); @@ -2218,10 +2223,8 @@ static void test_presenter_media_type(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); get_output_aperture(mixer, &frame_size, &aperture); -todo_wine { ok(frame_size.cx == 199 && frame_size.cy == 298, "Unexpected frame size %u x %u.\n", frame_size.cx, frame_size.cy); ok(aperture.Area.cx == 199 && aperture.Area.cy == 298, "Unexpected size %u x %u.\n", aperture.Area.cx, aperture.Area.cy); -} ok(!aperture.OffsetX.value && !aperture.OffsetX.fract && !aperture.OffsetY.value && !aperture.OffsetY.fract, "Unexpected offset %u x %u.\n", aperture.OffsetX.value, aperture.OffsetY.value); @@ -2229,10 +2232,8 @@ todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); get_output_aperture(mixer, &frame_size, &aperture); -todo_wine { ok(frame_size.cx == 199 && frame_size.cy == 298, "Unexpected frame size %u x %u.\n", frame_size.cx, frame_size.cy); ok(aperture.Area.cx == 199 && aperture.Area.cy == 298, "Unexpected size %u x %u.\n", aperture.Area.cx, aperture.Area.cy); -} ok(!aperture.OffsetX.value && !aperture.OffsetX.fract && !aperture.OffsetY.value && !aperture.OffsetY.fract, "Unexpected offset %u x %u.\n", aperture.OffsetX.value, aperture.OffsetY.value);

1 0