July 2021 - Wine-Devel - list.winehq.org

[PATCH 1/5] include: Add a helper macro to define wine AFD control codes.
by Zebediah Figura July 1, 2021

July 1, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/wine/afd.h | 82 ++++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/include/wine/afd.h b/include/wine/afd.h index c672168bc6a..5db8fb1f4de 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -140,46 +140,48 @@ struct afd_get_events_params NTSTATUS status[13]; }; -#define IOCTL_AFD_WINE_CREATE CTL_CODE(FILE_DEVICE_NETWORK, 200, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_ACCEPT CTL_CODE(FILE_DEVICE_NETWORK, 201, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_ACCEPT_INTO CTL_CODE(FILE_DEVICE_NETWORK, 202, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_CONNECT CTL_CODE(FILE_DEVICE_NETWORK, 203, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SHUTDOWN CTL_CODE(FILE_DEVICE_NETWORK, 204, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_RECVMSG CTL_CODE(FILE_DEVICE_NETWORK, 205, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SENDMSG CTL_CODE(FILE_DEVICE_NETWORK, 206, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_TRANSMIT CTL_CODE(FILE_DEVICE_NETWORK, 207, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE CTL_CODE(FILE_DEVICE_NETWORK, 208, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_FIONBIO CTL_CODE(FILE_DEVICE_NETWORK, 209, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_COMPLETE_ASYNC CTL_CODE(FILE_DEVICE_NETWORK, 210, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_FIONREAD CTL_CODE(FILE_DEVICE_NETWORK, 211, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SIOCATMARK CTL_CODE(FILE_DEVICE_NETWORK, 212, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_INTERFACE_LIST CTL_CODE(FILE_DEVICE_NETWORK, 213, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_KEEPALIVE_VALS CTL_CODE(FILE_DEVICE_NETWORK, 214, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_MESSAGE_SELECT CTL_CODE(FILE_DEVICE_NETWORK, 215, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GETPEERNAME CTL_CODE(FILE_DEVICE_NETWORK, 216, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_DEFER CTL_CODE(FILE_DEVICE_NETWORK, 217, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_INFO CTL_CODE(FILE_DEVICE_NETWORK, 218, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_ACCEPTCONN CTL_CODE(FILE_DEVICE_NETWORK, 219, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_BROADCAST CTL_CODE(FILE_DEVICE_NETWORK, 220, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_BROADCAST CTL_CODE(FILE_DEVICE_NETWORK, 221, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_ERROR CTL_CODE(FILE_DEVICE_NETWORK, 222, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_KEEPALIVE CTL_CODE(FILE_DEVICE_NETWORK, 223, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_KEEPALIVE CTL_CODE(FILE_DEVICE_NETWORK, 224, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_LINGER CTL_CODE(FILE_DEVICE_NETWORK, 225, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_LINGER CTL_CODE(FILE_DEVICE_NETWORK, 226, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_OOBINLINE CTL_CODE(FILE_DEVICE_NETWORK, 227, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_OOBINLINE CTL_CODE(FILE_DEVICE_NETWORK, 228, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_RCVBUF CTL_CODE(FILE_DEVICE_NETWORK, 229, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_RCVBUF CTL_CODE(FILE_DEVICE_NETWORK, 230, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_RCVTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 231, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_RCVTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 232, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_REUSEADDR CTL_CODE(FILE_DEVICE_NETWORK, 233, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_REUSEADDR CTL_CODE(FILE_DEVICE_NETWORK, 234, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_SNDBUF CTL_CODE(FILE_DEVICE_NETWORK, 235, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_SNDBUF CTL_CODE(FILE_DEVICE_NETWORK, 236, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_SNDTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 237, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_SNDTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 238, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_IP_ADD_MEMBERSHIP CTL_CODE(FILE_DEVICE_NETWORK, 239, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define WINE_AFD_IOC(x) CTL_CODE(FILE_DEVICE_NETWORK, x, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_AFD_WINE_CREATE WINE_AFD_IOC(200) +#define IOCTL_AFD_WINE_ACCEPT WINE_AFD_IOC(201) +#define IOCTL_AFD_WINE_ACCEPT_INTO WINE_AFD_IOC(202) +#define IOCTL_AFD_WINE_CONNECT WINE_AFD_IOC(203) +#define IOCTL_AFD_WINE_SHUTDOWN WINE_AFD_IOC(204) +#define IOCTL_AFD_WINE_RECVMSG WINE_AFD_IOC(205) +#define IOCTL_AFD_WINE_SENDMSG WINE_AFD_IOC(206) +#define IOCTL_AFD_WINE_TRANSMIT WINE_AFD_IOC(207) +#define IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE WINE_AFD_IOC(208) +#define IOCTL_AFD_WINE_FIONBIO WINE_AFD_IOC(209) +#define IOCTL_AFD_WINE_COMPLETE_ASYNC WINE_AFD_IOC(210) +#define IOCTL_AFD_WINE_FIONREAD WINE_AFD_IOC(211) +#define IOCTL_AFD_WINE_SIOCATMARK WINE_AFD_IOC(212) +#define IOCTL_AFD_WINE_GET_INTERFACE_LIST WINE_AFD_IOC(213) +#define IOCTL_AFD_WINE_KEEPALIVE_VALS WINE_AFD_IOC(214) +#define IOCTL_AFD_WINE_MESSAGE_SELECT WINE_AFD_IOC(215) +#define IOCTL_AFD_WINE_GETPEERNAME WINE_AFD_IOC(216) +#define IOCTL_AFD_WINE_DEFER WINE_AFD_IOC(217) +#define IOCTL_AFD_WINE_GET_INFO WINE_AFD_IOC(218) +#define IOCTL_AFD_WINE_GET_SO_ACCEPTCONN WINE_AFD_IOC(219) +#define IOCTL_AFD_WINE_GET_SO_BROADCAST WINE_AFD_IOC(220) +#define IOCTL_AFD_WINE_SET_SO_BROADCAST WINE_AFD_IOC(221) +#define IOCTL_AFD_WINE_GET_SO_ERROR WINE_AFD_IOC(222) +#define IOCTL_AFD_WINE_GET_SO_KEEPALIVE WINE_AFD_IOC(223) +#define IOCTL_AFD_WINE_SET_SO_KEEPALIVE WINE_AFD_IOC(224) +#define IOCTL_AFD_WINE_GET_SO_LINGER WINE_AFD_IOC(225) +#define IOCTL_AFD_WINE_SET_SO_LINGER WINE_AFD_IOC(226) +#define IOCTL_AFD_WINE_GET_SO_OOBINLINE WINE_AFD_IOC(227) +#define IOCTL_AFD_WINE_SET_SO_OOBINLINE WINE_AFD_IOC(228) +#define IOCTL_AFD_WINE_SET_SO_RCVBUF WINE_AFD_IOC(229) +#define IOCTL_AFD_WINE_GET_SO_RCVBUF WINE_AFD_IOC(230) +#define IOCTL_AFD_WINE_SET_SO_RCVTIMEO WINE_AFD_IOC(231) +#define IOCTL_AFD_WINE_GET_SO_RCVTIMEO WINE_AFD_IOC(232) +#define IOCTL_AFD_WINE_GET_SO_REUSEADDR WINE_AFD_IOC(233) +#define IOCTL_AFD_WINE_SET_SO_REUSEADDR WINE_AFD_IOC(234) +#define IOCTL_AFD_WINE_SET_SO_SNDBUF WINE_AFD_IOC(235) +#define IOCTL_AFD_WINE_GET_SO_SNDBUF WINE_AFD_IOC(236) +#define IOCTL_AFD_WINE_GET_SO_SNDTIMEO WINE_AFD_IOC(237) +#define IOCTL_AFD_WINE_SET_SO_SNDTIMEO WINE_AFD_IOC(238) +#define IOCTL_AFD_WINE_SET_IP_ADD_MEMBERSHIP WINE_AFD_IOC(239) struct afd_create_params { -- 2.30.2

2 8

[PATCH v5 1/3] advapi32/tests: Add some test for perflib keys.
by Zebediah Figura July 1, 2021

July 1, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/advapi32/tests/registry.c | 139 +++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 72423eae94c..cdf9b18f5d1 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -99,6 +99,11 @@ static void InitFunctionPtrs(void) pNtUnloadKey = (void *)GetProcAddress( hntdll, "NtUnloadKey" ); } +static BOOL is_special_key(HKEY key) +{ + return !!((ULONG_PTR)key & 0x80000000); +} + /* delete key and all its subkeys */ static DWORD delete_key( HKEY hkey ) { @@ -3809,6 +3814,139 @@ todo_wine ok(dwret == ERROR_SUCCESS, "got %u\n", dwret); } +static void test_perflib_key(void) +{ + unsigned int primary_lang = PRIMARYLANGID(GetUserDefaultLangID()); + unsigned int buffer_size = 1024 * 1024; + OBJECT_NAME_INFORMATION *name_info; + HKEY perflib_key, key, key2; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + char lang_name[4]; + char *buffer; + DWORD size; + LONG ret; + + ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, + "Software\\Microsoft\\Windows NT\\CurrentVersion\\Perflib", 0, KEY_READ, &perflib_key); + ok(!ret, "got %u\n", ret); + + ret = RegOpenKeyExA(perflib_key, "009", 0, KEY_READ, &key); + todo_wine ok(!ret, "got %u\n", ret); + /* English always returns TEXT; most other languages return NLSTEXT, but + * some (e.g. Hindi) return TEXT */ + todo_wine ok(key == HKEY_PERFORMANCE_TEXT || key == HKEY_PERFORMANCE_NLSTEXT, "got key %p\n", key); + + ret = RegCloseKey(key); + todo_wine ok(!ret, "got %u\n", ret); + + RtlInitUnicodeString(&string, L"009"); + InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE, perflib_key, NULL); + ret = NtOpenKey((HANDLE *)&key, KEY_ALL_ACCESS, &attr); + todo_wine ok(ret == STATUS_PREDEFINED_HANDLE || ret == STATUS_ACCESS_DENIED + || ret == STATUS_SUCCESS /* Win < 7 */, "got %#x\n", ret); + if (ret == STATUS_PREDEFINED_HANDLE) + ok(!is_special_key(key), "expected a normal handle, got %p\n", key); + else if (ret == STATUS_SUCCESS) + ok(key == HKEY_PERFORMANCE_TEXT, "got key %p\n", key); + else + { + skip("Not enough permissions to test the perflib key.\n"); + RegCloseKey(perflib_key); + return; + } + + buffer = malloc(buffer_size); + + ret = NtQueryKey(key, KeyFullInformation, buffer, buffer_size, &size); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + ret = NtEnumerateKey(key, 0, KeyFullInformation, buffer, buffer_size, &size); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + RtlInitUnicodeString(&string, L"counter"); + ret = NtQueryValueKey(key, &string, KeyValuePartialInformation, buffer, buffer_size, &size); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + ret = NtEnumerateValueKey(key, 0, KeyValuePartialInformation, buffer, buffer_size, &size); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + ret = NtSetValueKey(key, &string, 0, REG_SZ, "test", 5); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + ret = NtDeleteValueKey(key, &string); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + ret = NtDeleteKey(key); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + RtlInitUnicodeString(&string, L"subkey"); + InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE, key, NULL); + ret = NtOpenKey((HANDLE *)&key2, KEY_READ, &attr); + if (is_special_key(key)) + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + else + ok(ret == STATUS_OBJECT_NAME_NOT_FOUND + || broken(ret == STATUS_INVALID_HANDLE) /* WoW64 */, "got %#x\n", ret); + + ret = NtCreateKey((HANDLE *)&key2, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL); + if (is_special_key(key)) + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + else + ok(!ret || broken(ret == STATUS_ACCESS_DENIED) /* w8adm */ + || broken(ret == STATUS_INVALID_HANDLE) /* WoW64 */, "got %#x\n", ret); + if (!ret) + { + NtDeleteKey(key2); + NtClose(key2); + } + + /* it's a real handle, though */ + ret = NtQueryObject(key, ObjectNameInformation, buffer, buffer_size, &size); + if (is_special_key(key)) + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + else + ok(!ret, "got %#x\n", ret); + if (!ret) + { + name_info = (OBJECT_NAME_INFORMATION *)buffer; + ok(!wcsicmp(name_info->Name.Buffer, L"\\REGISTRY\\MACHINE\\SOFTWARE\\Microsoft\\Windows NT" + "\\CurrentVersion\\Perflib\\009"), "got name %s\n", debugstr_w(name_info->Name.Buffer)); + } + + ret = NtClose(key); + if (is_special_key(key)) + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + else + ok(!ret, "got %#x\n", ret); + + /* multilingual support was not really completely thought through */ + + sprintf(lang_name, "%03x", primary_lang); + if (primary_lang != LANG_ENGLISH) + { + ret = RegOpenKeyExA(perflib_key, lang_name, 0, KEY_READ, &key); + todo_wine ok(!ret, "got %u\n", ret); + ok(!is_special_key(key), "expected a normal handle, got %p\n", key); + + ret = RegQueryValueExA(key, "counter", NULL, NULL, (BYTE *)buffer, &size); + todo_wine ok(ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret); + + ret = RegCloseKey(key); + todo_wine ok(!ret, "got %u\n", ret); + } + + ret = RegCloseKey(perflib_key); + ok(!ret, "got %u\n", ret); + + RtlInitUnicodeString(&string, L"\\Registry\\PerfData"); + InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE, NULL, NULL); + ret = NtOpenKey((HANDLE *)&key, KEY_READ, &attr); + todo_wine ok(ret == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", ret); + + free(buffer); +} + static void test_RegLoadMUIString(void) { HMODULE hUser32, hResDll, hFile; @@ -4213,6 +4351,7 @@ START_TEST(registry) test_RegQueryValueExPerformanceData(); test_RegLoadMUIString(); test_EnumDynamicTimeZoneInformation(); + test_perflib_key(); /* cleanup */ delete_key( hkey_main ); -- 2.30.2

1 2

Why did hid:device start timing out on May 24th?
by Francois Gouget July 1, 2021

July 1, 2021

The failure pattern shows that hid:device started timing out about 20% of the time on the debiant2 VM on or about the 24th of May: https://test.winehq.org/data/patterns.html#hid:device debiant2 was last modified on 2021-05-11 so that's not it. There is no obviously related commit on that date. I tried bisecting for a commit by considering a commit good only if the test succeeds 25 times in a row. But that was inconclusive. Similarly I looked for another test interfering with hid:device (with the same repeat count), but that was inconclusive too. So does anyone have any idea what could have changed? Or better yet, have a fix for it? Note that the timeout seems to only impact the tests running in a non-English locale or a WoW Wine build. In other words anything that's not the plain 32-bit English Wine. That's strange too. -- Francois Gouget <fgouget(a)codeweavers.com>

2 2

[PATCH v3 2/4] d3dx10: Implement D3DX10CreateTextureFromMemory initially.
by Ziqing Hui July 1, 2021

July 1, 2021

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/d3dx10_43_main.c | 11 -- dlls/d3dx10_43/tests/d3dx10.c | 8 +- dlls/d3dx10_43/texture.c | 229 ++++++++++++++++++++++++++++++++ 3 files changed, 232 insertions(+), 16 deletions(-)

3 2

[PATCH v4 4/4] d3dx10: Support block compressed formats in D3DX10CreateTextureFromMemory().
by Matteo Bruni July 1, 2021

July 1, 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> --- v4: Declare block_compressed_formats[] as const. dlls/d3dx10_43/tests/d3dx10.c | 4 +- dlls/d3dx10_43/texture.c | 87 ++++++++++++++++++++++++++--------- 2 files changed, 69 insertions(+), 22 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index d5d1f02441c..30d766bf244 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1147,6 +1147,8 @@ static void check_resource_data(ID3D10Resource *resource, const struct test_imag { line_match = !memcmp(image->expected_data + stride * i, (BYTE *)map.pData + map.RowPitch * i, stride); + todo_wine_if(is_block_compressed(image->expected_info.Format) + && (image->expected_info.Width % 4 != 0 || image->expected_info.Height % 4 != 0)) ok_(__FILE__, line)(line_match, "Data mismatch for line %u.\n", i); if (!line_match) break; @@ -1997,7 +1999,7 @@ static void test_create_texture(void) winetest_push_context("Test %u", i); hr = D3DX10CreateTextureFromMemory(device, test_image[i].data, test_image[i].size, NULL, NULL, &resource, NULL); - todo_wine_if(is_block_compressed(test_image[i].expected_info.Format)) + todo_wine_if(test_image[i].expected_info.MiscFlags & D3D10_RESOURCE_MISC_TEXTURECUBE) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); if (hr == S_OK) { diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 8765f312f4c..8d30aef8648 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -71,6 +71,17 @@ wic_pixel_formats[] = { &GUID_WICPixelFormat128bppRGBAFloat, DXGI_FORMAT_R32G32B32A32_FLOAT } }; +static const DXGI_FORMAT block_compressed_formats[] = +{ + DXGI_FORMAT_BC1_TYPELESS, DXGI_FORMAT_BC1_UNORM, DXGI_FORMAT_BC1_UNORM_SRGB, + DXGI_FORMAT_BC2_TYPELESS, DXGI_FORMAT_BC2_UNORM, DXGI_FORMAT_BC2_UNORM_SRGB, + DXGI_FORMAT_BC3_TYPELESS, DXGI_FORMAT_BC3_UNORM, DXGI_FORMAT_BC3_UNORM_SRGB, + DXGI_FORMAT_BC4_TYPELESS, DXGI_FORMAT_BC4_UNORM, DXGI_FORMAT_BC4_SNORM, + DXGI_FORMAT_BC5_TYPELESS, DXGI_FORMAT_BC5_UNORM, DXGI_FORMAT_BC5_SNORM, + DXGI_FORMAT_BC6H_TYPELESS, DXGI_FORMAT_BC6H_UF16, DXGI_FORMAT_BC6H_SF16, + DXGI_FORMAT_BC7_TYPELESS, DXGI_FORMAT_BC7_UNORM, DXGI_FORMAT_BC7_UNORM_SRGB +}; + static const DXGI_FORMAT to_be_converted_format[] = { DXGI_FORMAT_UNKNOWN, @@ -124,6 +135,17 @@ static D3D10_RESOURCE_DIMENSION wic_dimension_to_d3dx10_dimension(WICDdsDimensio } } +static BOOL is_block_compressed(DXGI_FORMAT format) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(block_compressed_formats); ++i) + if (format == block_compressed_formats[i]) + return TRUE; + + return FALSE; +} + static unsigned int get_bpp_from_format(DXGI_FORMAT format) { switch (format) @@ -556,6 +578,7 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s { unsigned int frame_count, width, height, stride, frame_size; IWICFormatConverter *converter = NULL; + IWICDdsFrameDecode *dds_frame = NULL; D3D10_TEXTURE2D_DESC texture_2d_desc; D3D10_SUBRESOURCE_DATA resource_data; IWICBitmapFrameDecode *frame = NULL; @@ -582,6 +605,11 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s if (FAILED(D3DX10GetImageInfoFromMemory(src_data, src_data_size, NULL, &img_info, NULL))) return E_FAIL; + if (img_info.MiscFlags & D3D10_RESOURCE_MISC_TEXTURECUBE) + { + FIXME("Cube map is not supported.\n"); + return E_FAIL; + } if (FAILED(hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory))) goto end; @@ -600,6 +628,11 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s width = img_info.Width; height = img_info.Height; + if (is_block_compressed(img_info.Format)) + { + width = (width + 3) & ~3; + height = (height + 3) & ~3; + } stride = (width * get_bpp_from_format(img_info.Format) + 7) / 8; frame_size = stride * height; @@ -609,35 +642,45 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s goto end; } - if (!(dst_format = dxgi_format_to_wic_guid(img_info.Format))) + if (is_block_compressed(img_info.Format)) { - hr = E_FAIL; - FIXME("Unsupported DXGI format %#x.\n", img_info.Format); - goto end; - } - - if (IsEqualGUID(&src_format, dst_format)) - { - if (FAILED(hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, stride, frame_size, buffer))) + if (FAILED(hr = IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICDdsFrameDecode, (void **)&dds_frame))) + goto end; + if (FAILED(hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, stride * 4, frame_size, buffer))) goto end; } else { - if (FAILED(hr = IWICImagingFactory_CreateFormatConverter(factory, &converter))) - goto end; - if (FAILED(hr = IWICFormatConverter_CanConvert(converter, &src_format, dst_format, &can_convert))) - goto end; - if (!can_convert) + if (!(dst_format = dxgi_format_to_wic_guid(img_info.Format))) { - WARN("Format converting %s to %s is not supported by WIC.\n", - debugstr_guid(&src_format), debugstr_guid(dst_format)); + hr = E_FAIL; + FIXME("Unsupported DXGI format %#x.\n", img_info.Format); goto end; } - if (FAILED(hr = IWICFormatConverter_Initialize(converter, (IWICBitmapSource *)frame, dst_format, - WICBitmapDitherTypeErrorDiffusion, 0, 0, WICBitmapPaletteTypeCustom))) - goto end; - if (FAILED(hr = IWICFormatConverter_CopyPixels(converter, NULL, stride, frame_size, buffer))) - goto end; + + if (IsEqualGUID(&src_format, dst_format)) + { + if (FAILED(hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, stride, frame_size, buffer))) + goto end; + } + else + { + if (FAILED(hr = IWICImagingFactory_CreateFormatConverter(factory, &converter))) + goto end; + if (FAILED(hr = IWICFormatConverter_CanConvert(converter, &src_format, dst_format, &can_convert))) + goto end; + if (!can_convert) + { + WARN("Format converting %s to %s is not supported by WIC.\n", + debugstr_guid(&src_format), debugstr_guid(dst_format)); + goto end; + } + if (FAILED(hr = IWICFormatConverter_Initialize(converter, (IWICBitmapSource *)frame, dst_format, + WICBitmapDitherTypeErrorDiffusion, 0, 0, WICBitmapPaletteTypeCustom))) + goto end; + if (FAILED(hr = IWICFormatConverter_CopyPixels(converter, NULL, stride, frame_size, buffer))) + goto end; + } } memset(&texture_2d_desc, 0, sizeof(texture_2d_desc)); @@ -664,6 +707,8 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s end: if (converter) IWICFormatConverter_Release(converter); + if (dds_frame) + IWICDdsFrameDecode_Release(dds_frame); if (buffer) heap_free(buffer); if (frame) -- 2.26.3

1 0

[PATCH v3 3/4] d3dx10: Handle format converting for D3DX10CreateTextureFromMemory.
by Ziqing Hui July 1, 2021

July 1, 2021

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 3 +- dlls/d3dx10_43/texture.c | 83 ++++++++++++++++++++++++++++++++--- 2 files changed, 78 insertions(+), 8 deletions(-)

2 1

[PATCH v3 1/4] d3dx10/tests: Test texture returned by D3DX10CreateTextureFromMemory on failure.
by Ziqing Hui July 1, 2021

July 1, 2021

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v3: Fix test failure. dlls/d3dx10_43/tests/d3dx10.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)

2 1

[tools] winetest: Remove the unused td.arrow CSS style.
by Francois Gouget July 1, 2021

July 1, 2021

The up/down arrows are now positioned using the ralign class rather than a table. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/report.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/winetest/report.css b/winetest/report.css index 80be53dbe..b558c6ff7 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -65,10 +65,6 @@ table.output td { text-align: left; } -td.arrow :link { color: #ffffff; text-decoration: none; } -td.arrow :visited { color: #ffffff; text-decoration: none; } -td.arrow :hover { color: #ffffff; text-decoration: underline; } - .ralign { display: inline-block; float: right; -- 2.20.1

1 0

[tools] winetest/gather: Truncated files are rejected.
by Francois Gouget July 1, 2021

July 1, 2021

When a report size exceeds the size limit it is dropped so the corresponding summary.txt file will never contain "failed filelimit". Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/gather | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/winetest/gather b/winetest/gather index 1e9b2da36..abb339598 100755 --- a/winetest/gather +++ b/winetest/gather @@ -108,8 +108,6 @@ sub short_date($) # group A reference to the group the report belongs to. # missing A hash of the reason why some test results are missing, # indexed by the test unit name. -# filelimit The name of the last test that was run before the report file -# size limit was reached. # <testname> Maps the test names to a structure containing the individual # unit test's results. Note that there's no name collision # with the other fields because the test names contain a ':'. @@ -349,9 +347,6 @@ foreach my $file (glob "$builddir/*/summary.txt") { if ($count eq "failed") { if ($todos eq "crash") { $report->{$testname} = { status => "crash" }; - } elsif ($todos eq "filelimit") { - $report->{$testname} = { status => "file limit" }; - $report->{filelimit} = $testname; } else { $report->{$testname} = { status => $todos }; } @@ -437,16 +432,12 @@ foreach my $group (@groups) { foreach my $report (@{$group->{reports}}) { if (!exists $report->{$testname}) { my ($dll, $unit) = split(/:/, $testname); - my $filelimit = $report->{filelimit}; if (exists $report->{missing}->{$dll}) { # Record the reason why this test is missing $report->{$testname} = { status => $report->{missing}->{$dll}, count => [ 1, 1 ], skips => [ 1, 1 ] }; - } elsif (defined $filelimit && $testname gt $filelimit) { - # Mark this test as missing because of a partial report file - $report->{$testname}->{status} = "truncated"; } else { # Mark this test as missing for an unknown reason (typically # the start & done lines where unrecognizable) @@ -650,7 +641,6 @@ sub get_result_title($$) if ($result->{status} eq "crash") { return "Test crashed"; } if ($result->{status} eq "258") { return "Test timed out"; } if ($result->{status} eq "skipped") { return "Skipped by user request"; } - if ($result->{status} eq "truncated") { return "The report was truncated"; } my ($dll, $unit) = split(/:/, $testname); $dll.=".dll" if ($dll !~ /\....?$/); @@ -737,7 +727,6 @@ sub singletest($$$) { crash => "crashed", 258 => "timeout", mixed => "mixed", - truncated => "truncated", ); $msg = $status2label{$status} || "unknown"; } -- 2.20.1

1 0

[tools] winetest/gather: Link 'test list' failures to the test's version page.
by Francois Gouget July 1, 2021

July 1, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/gather | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/winetest/gather b/winetest/gather index e00077792..1e9b2da36 100755 --- a/winetest/gather +++ b/winetest/gather @@ -693,6 +693,12 @@ sub singletest($$$) { { $href = "$report->{dir}/$testname.html"; } + elsif (-r "$builddir/$report->{dir}/version.html") + { + my $dll = $testname; + $dll =~ s/:.*//; + $href = "$report->{dir}/version.html#$dll"; + } else { $href=""; -- 2.20.1

1 0