- Wine-Devel - list.winehq.org

[PATCH] d3dx9/tests: Add some tests for constant descriptions in texture shaders.
by Nikolay Sivov Oct. 26, 2021

Oct. 26, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx9_36/tests/texture.c | 191 +++++++++++++++++++++++++++++++++- 1 file changed, 189 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 26e5aa3dbb6..9e2c999c5f2 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -2351,21 +2351,87 @@ float4 main(float3 pos : POSITION, float3 size : PSIZE) : COLOR 0x00000003, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x10000001, 0x00000001, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000004, 0x00000003, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, }; +#if 0 +float f1[2] = { 0.4f, 0.1f }; +bool b1 = false; +float4 f2; +bool b2[2]; + +struct s +{ + bool b3; + float f3; + float4 f4; + uint i1; + int i2; +}; + +struct s s1; + +float4 main(float3 pos : POSITION, float3 size : PSIZE) : COLOR +{ + float t = b2[0] * b2[1] * f2.x + s1.i2; + return float4(pos, f1[0] + f1[1] + b1 * 0.6f + t); +} +#endif + static const DWORD shader_code2[] = + { + 0x54580100, 0x0074fffe, 0x42415443, 0x0000001c, 0x000001a3, 0x54580100, 0x00000005, 0x0000001c, + 0x00000100, 0x000001a0, 0x00000080, 0x00090002, 0x00000001, 0x00000084, 0x00000094, 0x000000a4, + 0x00070002, 0x00000002, 0x000000a8, 0x00000000, 0x000000b8, 0x00050002, 0x00000002, 0x000000bc, + 0x000000cc, 0x000000ec, 0x000a0002, 0x00000001, 0x000000f0, 0x00000000, 0x00000100, 0x00000002, + 0x00000005, 0x00000190, 0x00000000, 0xab003162, 0x00010000, 0x00010001, 0x00000001, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xab003262, 0x00010000, 0x00010001, 0x00000002, + 0x00000000, 0xab003166, 0x00030000, 0x00010001, 0x00000002, 0x00000000, 0x3ecccccd, 0x00000000, + 0x00000000, 0x00000000, 0x3dcccccd, 0x00000000, 0x00000000, 0x00000000, 0xab003266, 0x00030001, + 0x00040001, 0x00000001, 0x00000000, 0x62003173, 0xabab0033, 0x00010000, 0x00010001, 0x00000001, + 0x00000000, 0xab003366, 0x00030000, 0x00010001, 0x00000001, 0x00000000, 0xab003466, 0x00030001, + 0x00040001, 0x00000001, 0x00000000, 0xab003169, 0x00020000, 0x00010001, 0x00000001, 0x00000000, + 0xab003269, 0x00020000, 0x00010001, 0x00000001, 0x00000000, 0x00000103, 0x00000108, 0x00000118, + 0x0000011c, 0x0000012c, 0x00000130, 0x00000140, 0x00000144, 0x00000154, 0x00000158, 0x00000005, + 0x00080001, 0x00050001, 0x00000168, 0x4d007874, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, + 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x30312072, 0xab00312e, 0x0062fffe, 0x54494c43, + 0x00000030, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x40000000, 0x3fe33333, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x0059fffe, 0x434c5846, 0x00000008, 0xa0500001, 0x00000002, 0x00000000, 0x00000002, + 0x0000001c, 0x00000000, 0x00000002, 0x00000020, 0x00000000, 0x00000007, 0x00000000, 0xa0500001, + 0x00000002, 0x00000000, 0x00000007, 0x00000000, 0x00000000, 0x00000002, 0x00000028, 0x00000000, + 0x00000007, 0x00000004, 0xa0400001, 0x00000002, 0x00000000, 0x00000007, 0x00000004, 0x00000000, + 0x00000002, 0x00000010, 0x00000000, 0x00000007, 0x00000000, 0xa0400001, 0x00000002, 0x00000000, + 0x00000002, 0x00000014, 0x00000000, 0x00000002, 0x00000018, 0x00000000, 0x00000007, 0x00000001, + 0xa0500001, 0x00000002, 0x00000000, 0x00000002, 0x00000024, 0x00000000, 0x00000001, 0x0000002c, + 0x00000000, 0x00000007, 0x00000002, 0xa0400001, 0x00000002, 0x00000000, 0x00000007, 0x00000002, + 0x00000000, 0x00000007, 0x00000001, 0x00000000, 0x00000007, 0x00000004, 0xa0400001, 0x00000002, + 0x00000000, 0x00000007, 0x00000000, 0x00000000, 0x00000007, 0x00000004, 0x00000000, 0x00000004, + 0x00000003, 0x10000003, 0x00000001, 0x00000000, 0x00000003, 0x00000000, 0x00000000, 0x00000004, + 0x00000000, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, + }; IDirect3DVolumeTexture9 *volume_texture; IDirect3DCubeTexture9 *cube_texture; D3DXCONSTANTTABLE_DESC ctab_desc; ID3DXBuffer *buffer, *buffer2; + D3DXCONSTANT_DESC const_desc; + unsigned int x, y, z, count; D3DPRESENT_PARAMETERS d3dpp; IDirect3DTexture9 *texture; IDirect3DDevice9 *device; ID3DXTextureShader *tx; - unsigned int x, y, z; unsigned int *data; D3DLOCKED_RECT lr; D3DLOCKED_BOX lb; + D3DXHANDLE h, h2; IDirect3D9 *d3d; D3DCAPS9 caps; - D3DXHANDLE h; DWORD size; HRESULT hr; HWND wnd; @@ -2577,6 +2643,127 @@ todo_wine IDirect3DVolumeTexture9_Release(volume_texture); + IUnknown_Release(tx); + + /* With constant table */ + hr = D3DXCreateTextureShader(shader_code2, &tx); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + hr = tx->lpVtbl->GetConstantBuffer(tx, &buffer); +todo_wine + ok(SUCCEEDED(hr), "Failed to get texture shader constant buffer.\n"); + if (FAILED(hr)) + { + skip("Texture shaders not supported, skipping further tests.\n"); + IUnknown_Release(tx); + return; + } + + size = ID3DXBuffer_GetBufferSize(buffer); + ok(size == 176, "Unexpected buffer size %u.\n", size); + + hr = tx->lpVtbl->GetDesc(tx, &ctab_desc); + ok(hr == S_OK, "Failed to get constant description, hr %#x.\n", hr); + ok(ctab_desc.Constants == 5, "Unexpected number of constants %u.\n", ctab_desc.Constants); + + h = tx->lpVtbl->GetConstant(tx, NULL, 0); + ok(!!h, "Unexpected handle %p.\n", h); + hr = tx->lpVtbl->GetConstantDesc(tx, h, &const_desc, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(const_desc.Name, "b1"), "Unexpected name %s.\n", const_desc.Name); + ok(const_desc.RegisterSet == D3DXRS_FLOAT4, "Unexpected register set %u.\n", const_desc.RegisterSet); + ok(const_desc.RegisterIndex == 9, "Unexpected register index %u.\n", const_desc.RegisterIndex); + ok(const_desc.RegisterCount == 1, "Unexpected register count %u.\n", const_desc.RegisterCount); + + h = tx->lpVtbl->GetConstant(tx, NULL, 1); + ok(!!h, "Unexpected handle %p.\n", h); + hr = tx->lpVtbl->GetConstantDesc(tx, h, &const_desc, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(const_desc.Name, "b2"), "Unexpected name %s.\n", const_desc.Name); + ok(const_desc.RegisterSet == D3DXRS_FLOAT4, "Unexpected register set %u.\n", const_desc.RegisterSet); + ok(const_desc.RegisterIndex == 7, "Unexpected register index %u.\n", const_desc.RegisterIndex); + ok(const_desc.RegisterCount == 2, "Unexpected register count %u.\n", const_desc.RegisterCount); + + h = tx->lpVtbl->GetConstant(tx, NULL, 2); + ok(!!h, "Unexpected handle %p.\n", h); + hr = tx->lpVtbl->GetConstantDesc(tx, h, &const_desc, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(const_desc.Name, "f1"), "Unexpected name %s.\n", const_desc.Name); + ok(const_desc.RegisterSet == D3DXRS_FLOAT4, "Unexpected register set %u.\n", const_desc.RegisterSet); + ok(const_desc.RegisterIndex == 5, "Unexpected register index %u.\n", const_desc.RegisterIndex); + ok(const_desc.RegisterCount == 2, "Unexpected register count %u.\n", const_desc.RegisterCount); + ok(const_desc.Elements == 2, "Unexpected elements count %u.\n", const_desc.Elements); + + /* Array */ + h2 = tx->lpVtbl->GetConstantElement(tx, h, 0); + ok(!!h2, "Unexpected handle %p.\n", h); + hr = tx->lpVtbl->GetConstantDesc(tx, h2, &const_desc, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(const_desc.Name, "f1"), "Unexpected name %s.\n", const_desc.Name); + ok(const_desc.RegisterSet == D3DXRS_FLOAT4, "Unexpected register set %u.\n", const_desc.RegisterSet); + ok(const_desc.RegisterIndex == 5, "Unexpected register index %u.\n", const_desc.RegisterIndex); + ok(const_desc.RegisterCount == 1, "Unexpected register count %u.\n", const_desc.RegisterCount); + ok(const_desc.Elements == 1, "Unexpected elements count %u.\n", const_desc.Elements); + + h2 = tx->lpVtbl->GetConstantElement(tx, h, 1); + ok(!!h2, "Unexpected handle %p.\n", h); + hr = tx->lpVtbl->GetConstantDesc(tx, h2, &const_desc, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(const_desc.Name, "f1"), "Unexpected name %s.\n", const_desc.Name); + ok(const_desc.RegisterSet == D3DXRS_FLOAT4, "Unexpected register set %u.\n", const_desc.RegisterSet); + ok(const_desc.RegisterIndex == 6, "Unexpected register index %u.\n", const_desc.RegisterIndex); + ok(const_desc.RegisterCount == 1, "Unexpected register count %u.\n", const_desc.RegisterCount); + ok(const_desc.Elements == 1, "Unexpected elements count %u.\n", const_desc.Elements); + + h2 = tx->lpVtbl->GetConstantElement(tx, h, 2); + ok(!h2, "Unexpected handle %p.\n", h); + + h = tx->lpVtbl->GetConstant(tx, NULL, 3); + ok(!!h, "Unexpected handle %p.\n", h); + hr = tx->lpVtbl->GetConstantDesc(tx, h, &const_desc, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(const_desc.Name, "f2"), "Unexpected name %s.\n", const_desc.Name); + ok(const_desc.RegisterSet == D3DXRS_FLOAT4, "Unexpected register set %u.\n", const_desc.RegisterSet); + ok(const_desc.RegisterIndex == 10, "Unexpected register index %u.\n", const_desc.RegisterIndex); + ok(const_desc.RegisterCount == 1, "Unexpected register count %u.\n", const_desc.RegisterCount); + + /* Structure */ + h = tx->lpVtbl->GetConstant(tx, NULL, 4); + ok(!!h, "Unexpected handle %p.\n", h); + hr = tx->lpVtbl->GetConstantDesc(tx, h, &const_desc, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(const_desc.Name, "s1"), "Unexpected name %s.\n", const_desc.Name); + ok(const_desc.RegisterSet == D3DXRS_FLOAT4, "Unexpected register set %u.\n", const_desc.RegisterSet); + ok(const_desc.RegisterIndex == 0, "Unexpected register index %u.\n", const_desc.RegisterIndex); + ok(const_desc.RegisterCount == 5, "Unexpected register count %u.\n", const_desc.RegisterCount); + ok(const_desc.Class == D3DXPC_STRUCT, "Unexpected class %u.\n", const_desc.Class); + ok(const_desc.StructMembers == 5, "Unexpected member count %u.\n", const_desc.StructMembers); + + h2 = tx->lpVtbl->GetConstant(tx, h, 0); + ok(!!h2, "Unexpected handle %p.\n", h); + hr = tx->lpVtbl->GetConstantDesc(tx, h2, &const_desc, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(const_desc.Name, "b3"), "Unexpected name %s.\n", const_desc.Name); + ok(const_desc.RegisterSet == D3DXRS_FLOAT4, "Unexpected register set %u.\n", const_desc.RegisterSet); + ok(const_desc.RegisterIndex == 0, "Unexpected register index %u.\n", const_desc.RegisterIndex); + ok(const_desc.RegisterCount == 1, "Unexpected register count %u.\n", const_desc.RegisterCount); + ok(const_desc.Elements == 1, "Unexpected elements count %u.\n", const_desc.Elements); + + h2 = tx->lpVtbl->GetConstant(tx, h, 1); + ok(!!h2, "Unexpected handle %p.\n", h); + hr = tx->lpVtbl->GetConstantDesc(tx, h2, &const_desc, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(const_desc.Name, "f3"), "Unexpected name %s.\n", const_desc.Name); + ok(const_desc.RegisterSet == D3DXRS_FLOAT4, "Unexpected register set %u.\n", const_desc.RegisterSet); + ok(const_desc.RegisterIndex == 1, "Unexpected register index %u.\n", const_desc.RegisterIndex); + ok(const_desc.RegisterCount == 1, "Unexpected register count %u.\n", const_desc.RegisterCount); + ok(const_desc.Elements == 1, "Unexpected elements count %u.\n", const_desc.Elements); + + h2 = tx->lpVtbl->GetConstant(tx, h, 10); + ok(!h2, "Unexpected handle %p.\n", h); + + ID3DXBuffer_Release(buffer); + cleanup: IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d); -- 2.33.0

2 1

[v2 PATCH 01/10] d3d10/effect: Return when effect creation fails.
by Matteo Bruni Oct. 26, 2021

Oct. 26, 2021

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- 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; -- 2.26.3

1 9

[v2 PATCH 3/3] d3dx10/tests: Add tests for D3DX10CreateTextureFromResource{A, W}.
by Matteo Bruni Oct. 26, 2021

Oct. 26, 2021

From: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Mark the D3DX10_IFF_WMP failure case broken(). Supersedes patch 217576. 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); -- 2.26.3

1 0

[v2 PATCH 2/3] d3dx10/tests: Add tests for D3DX10CreateTextureFromFile{A, W}.
by Matteo Bruni Oct. 26, 2021

Oct. 26, 2021

From: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Mark the D3DX10_IFF_WMP failure case broken(). Supersedes patch 217575. 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); -- 2.26.3

1 0

[PATCH 1/3] d3dx10/tests: Only accept D3DX10_IFF_WMP tests failure on Windows.
by Matteo Bruni Oct. 26, 2021

Oct. 26, 2021

Since eb0180e7b4df18d806ceb31e4a96e9a771b4db3e we're guaranteed to have support for the format in Wine. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- 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) { -- 2.26.3

1 0

[PATCH 1/4] msdasql: Implement IDBProperties GetPropertyInfo
by Alistair Leslie-Hughes Oct. 26, 2021

Oct. 26, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/Makefile.in | 2 +- dlls/msdasql/msdasql_main.c | 108 +++++++++++++++++++++++++++++++++- dlls/msdasql/tests/provider.c | 13 +++- 3 files changed, 119 insertions(+), 4 deletions(-) diff --git a/dlls/msdasql/Makefile.in b/dlls/msdasql/Makefile.in index 8c99c8ea6f0..04d9cb29f2a 100644 --- a/dlls/msdasql/Makefile.in +++ b/dlls/msdasql/Makefile.in @@ -1,5 +1,5 @@ MODULE = msdasql.dll -IMPORTS = uuid +IMPORTS = uuid ole32 oleaut32 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 00dbcec6780..8fac3fb23df 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -32,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msdasql); +DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -100,6 +102,76 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) return CLASS_E_CLASSNOTAVAILABLE; } +struct dbproperty +{ + const WCHAR *name; + DBPROPID id; + DBPROPOPTIONS options; + VARTYPE type; + HRESULT (*convert_dbproperty)(const WCHAR *src, VARIANT *dest); +}; + +struct mode_propval +{ + const WCHAR *name; + DWORD value; +}; + +static int __cdecl dbmodeprop_compare(const void *a, const void *b) +{ + const WCHAR *src = a; + const struct mode_propval *propval = b; + return wcsicmp(src, propval->name); +} + +static HRESULT convert_dbproperty_mode(const WCHAR *src, VARIANT *dest) +{ + struct mode_propval mode_propvals[] = + { + { L"Read", DB_MODE_READ }, + { L"ReadWrite", DB_MODE_READWRITE }, + { L"Share Deny None", DB_MODE_SHARE_DENY_NONE }, + { L"Share Deny Read", DB_MODE_SHARE_DENY_READ }, + { L"Share Deny Write", DB_MODE_SHARE_DENY_WRITE }, + { L"Share Exclusive", DB_MODE_SHARE_EXCLUSIVE }, + { L"Write", DB_MODE_WRITE }, + }; + struct mode_propval *prop; + + if ((prop = bsearch(src, mode_propvals, ARRAY_SIZE(mode_propvals), + sizeof(struct mode_propval), dbmodeprop_compare))) + { + V_VT(dest) = VT_I4; + V_I4(dest) = prop->value; + TRACE("%s = %#x\n", debugstr_w(src), prop->value); + return S_OK; + } + + return E_FAIL; +} + +static const struct dbproperty dbproperties[] = +{ + { L"Password", DBPROP_AUTH_PASSWORD, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"Persist Security Info", DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, + { L"User ID", DBPROP_AUTH_USERID, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"Data Source", DBPROP_INIT_DATASOURCE, DBPROPOPTIONS_REQUIRED, VT_BSTR }, +#ifndef _WIN64 + { L"Window Handle", DBPROP_INIT_HWND, DBPROPOPTIONS_OPTIONAL, VT_I4 }, +#else + { L"Window Handle", DBPROP_INIT_HWND, DBPROPOPTIONS_OPTIONAL, VT_I8 }, +#endif + { L"Location", DBPROP_INIT_LOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"Mode", DBPROP_INIT_MODE, DBPROPOPTIONS_OPTIONAL, VT_I4, convert_dbproperty_mode }, + { L"Prompt", DBPROP_INIT_PROMPT, DBPROPOPTIONS_OPTIONAL, VT_I2 }, + { L"Connect Timeout", DBPROP_INIT_TIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { L"Extended Properties", DBPROP_INIT_PROVIDERSTRING, DBPROPOPTIONS_REQUIRED, VT_BSTR }, + { L"Locale Identifier", DBPROP_INIT_LCID, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { L"Initial Catalog", DBPROP_CATALOGLOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"OLE DB Services", DBPROP_INIT_OLEDBSERVICES, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { L"General Timeout", DBPROP_INIT_GENERALTIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, +}; + struct msdasql { IUnknown MSDASQL_iface; @@ -222,11 +294,43 @@ static HRESULT WINAPI dbprops_GetPropertyInfo(IDBProperties *iface, ULONG cPrope DBPROPINFOSET **prgPropertyInfoSets, OLECHAR **ppDescBuffer) { struct msdasql *provider = impl_from_IDBProperties(iface); + int i; + DBPROPINFOSET *infoset; + int size = 1; + OLECHAR *ptr; - FIXME("(%p)->(%d %p %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, + TRACE("(%p)->(%d %p %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, prgPropertyInfoSets, ppDescBuffer); - return E_NOTIMPL; + infoset = CoTaskMemAlloc(sizeof(DBPROPINFOSET)); + memcpy(&infoset->guidPropertySet, &DBPROPSET_DBINIT, sizeof(GUID)); + infoset->cPropertyInfos = ARRAY_SIZE(dbproperties); + infoset->rgPropertyInfos = CoTaskMemAlloc(sizeof(DBPROPINFO) * ARRAY_SIZE(dbproperties)); + + for(i=0; i < ARRAY_SIZE(dbproperties); i++) + { + size += lstrlenW(dbproperties[i].name) + 1; + } + + ptr = *ppDescBuffer = CoTaskMemAlloc(size * sizeof(WCHAR)); + memset(*ppDescBuffer, 0, size * sizeof(WCHAR)); + + for(i=0; i < ARRAY_SIZE(dbproperties); i++) + { + lstrcpyW(ptr, dbproperties[i].name); + infoset->rgPropertyInfos[i].pwszDescription = ptr; + infoset->rgPropertyInfos[i].dwPropertyID = dbproperties[i].id; + infoset->rgPropertyInfos[i].dwFlags = DBPROPFLAGS_DBINIT | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE; + infoset->rgPropertyInfos[i].vtType = dbproperties[i].type; + V_VT(&infoset->rgPropertyInfos[i].vValues) = VT_EMPTY; + + ptr += lstrlenW(dbproperties[i].name) + 1; + } + + *pcPropertyInfoSets = 1; + *prgPropertyInfoSets = infoset; + + return S_OK; } static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG cPropertySets, diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 951ab2a7387..ff4757eb236 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -22,6 +22,7 @@ #include "msdasc.h" #include "oledb.h" #include "odbcinst.h" +#include "wtypes.h" #include "initguid.h" @@ -30,6 +31,7 @@ #include "wine/test.h" DEFINE_GUID(DBPROPSET_DBINITALL, 0xc8b522ca, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); static BOOL db_created; static char mdbpath[MAX_PATH]; @@ -52,16 +54,25 @@ static void test_Properties(void) infocount = 0; hr = IDBProperties_GetPropertyInfo(props, 1, &propidset, &infocount, &propinfoset, &desc); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { ULONG i; +#ifndef _WIN64 + VARTYPE types[14] = { VT_BSTR, VT_BOOL, VT_BSTR, VT_BSTR, VT_I4, VT_BSTR, VT_I4, VT_I2 , VT_I4, VT_BSTR, VT_I4, VT_BSTR, VT_I4, VT_I4 }; +#else + VARTYPE types[14] = { VT_BSTR, VT_BOOL, VT_BSTR, VT_BSTR, VT_I8, VT_BSTR, VT_I4, VT_I2 , VT_I4, VT_BSTR, VT_I4, VT_BSTR, VT_I4, VT_I4 }; +#endif + ok(IsEqualGUID(&propinfoset->guidPropertySet, &DBPROPSET_DBINIT), "got %s\n", debugstr_guid(&propinfoset->guidPropertySet)); ok(propinfoset->cPropertyInfos == 14, "got %d\n", propinfoset->cPropertyInfos); for (i = 0; i < propinfoset->cPropertyInfos; i++) { trace("%d: pwszDescription: %s\n", i, debugstr_w(propinfoset->rgPropertyInfos[i].pwszDescription) ); + ok(propinfoset->rgPropertyInfos[i].vtType == types[i], "got %d\n", propinfoset->rgPropertyInfos[i].vtType); + ok(propinfoset->rgPropertyInfos[i].dwFlags == (DBPROPFLAGS_DBINIT | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE), + "got %d\n", propinfoset->rgPropertyInfos[i].dwFlags); } for (i = 0; i < propinfoset->cPropertyInfos; i++) -- 2.33.0

3 2

[PATCH] ntdll: Fix alignment mask size in RtlInitializeExtendedContext2().
by Paul Gofman Oct. 26, 2021

Oct. 26, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- 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); -- 2.31.1

1 0

[PATCH] mfplay: Trace normalized rectangle arguments.
by Nikolay Sivov Oct. 26, 2021

Oct. 26, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- 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()); -- 2.33.0

1 0

[PATCH 1/2] evr/presenter: Remove scaling by zoom rectangle.
by Nikolay Sivov Oct. 26, 2021

Oct. 26, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Zooming should be handled by the mixer. dlls/evr/presenter.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index bf0f89df0eb..b8b18638185 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -460,21 +460,6 @@ static HRESULT video_presenter_get_sample_surface(IMFSample *sample, IDirect3DSu return hr; } -static void scale_rect(RECT *rect, unsigned int width, unsigned int height, const MFVideoNormalizedRect *scale) -{ - if (rect->left == 0.0f && rect->top == 0.0f && rect->right == 1.0f && rect->bottom == 1.0f) - { - SetRect(rect, 0, 0, width, height); - } - else - { - rect->left = width * scale->left; - rect->right = width * scale->right; - rect->top = height * scale->top; - rect->bottom = height * scale->bottom; - } -} - static void video_presenter_sample_present(struct video_presenter *presenter, IMFSample *sample) { IDirect3DSurface9 *surface, *backbuffer; @@ -503,7 +488,7 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM IDirect3DDevice9_StretchRect(device, surface, NULL, backbuffer, NULL, D3DTEXF_POINT); IDirect3DSurface9_GetDesc(surface, &desc); - scale_rect(&src, desc.Width, desc.Height, &presenter->src_rect); + SetRect(&src, 0, 0, desc.Width, desc.Height); IDirect3DSurface9_GetDesc(backbuffer, &desc); SetRect(&dst, 0, 0, desc.Width, desc.Height); -- 2.33.0

1 1

[PATCH 2/2] vcomp: Add _vcomp_for_static_simple_init_i8 implementation.
by Piotr Caban Oct. 26, 2021

Oct. 26, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43546 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48377 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/vcomp/main.c | 52 ++++++++++++ dlls/vcomp/tests/vcomp.c | 154 ++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 2 +- dlls/vcomp100/vcomp100.spec | 2 +- dlls/vcomp110/vcomp110.spec | 2 +- dlls/vcomp120/vcomp120.spec | 2 +- dlls/vcomp140/vcomp140.spec | 2 +- dlls/vcomp90/vcomp90.spec | 2 +- 8 files changed, 212 insertions(+), 6 deletions(-)

1 0