wine-commits July 2024

wine-commits@winehq.org

2 participants
519 discussions

Alfred Agrell : include: Fix typo in GUID_DEVCLASS_1394DEBUG.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: c89884bc3f7fe1581efa60f480ca6c9537d1cf63 URL: https://gitlab.winehq.org/wine/wine/-/commit/c89884bc3f7fe1581efa60f480ca6c… Author: Alfred Agrell <floating(a)muncher.se> Date: Sun May 5 01:35:54 2024 +0200 include: Fix typo in GUID_DEVCLASS_1394DEBUG. --- include/devguid.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/devguid.h b/include/devguid.h index 7a99ba0e6f7..b309bcaafa5 100644 --- a/include/devguid.h +++ b/include/devguid.h @@ -21,7 +21,7 @@ DEFINE_GUID( GUID_DEVCLASS_1394, 0x6BDD1FC1, 0x810F, 0x11D0, 0xBE, 0xC7, 0x08, 0x00, 0x2B, 0xE2, 0x09, 0x2F ); DEFINE_GUID( GUID_DEVCLASS_1394DEBUG, - 0x66F250D6, 0x7810, 0x4A64, 0xB1, 0x39, 0xEE, 0xA8, 0x0A, 0x45, 0x0B, 0x24 ); + 0x66F250D6, 0x7801, 0x4A64, 0xB1, 0x39, 0xEE, 0xA8, 0x0A, 0x45, 0x0B, 0x24 ); DEFINE_GUID( GUID_DEVCLASS_61883, 0x7EBEFBC0, 0x3200, 0x11D2, 0xB4, 0xC2, 0x00, 0xA0, 0xC9, 0x69, 0x7D, 0x07 ); DEFINE_GUID( GUID_DEVCLASS_ADAPTER,

1 0

Alfred Agrell : include: Fix typo in IID_IAudioLoudness.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: 32d92b004bd0507b2dd808696e8f26ea9c26f660 URL: https://gitlab.winehq.org/wine/wine/-/commit/32d92b004bd0507b2dd808696e8f26… Author: Alfred Agrell <floating(a)muncher.se> Date: Sun May 5 01:35:54 2024 +0200 include: Fix typo in IID_IAudioLoudness. --- include/devicetopology.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/devicetopology.idl b/include/devicetopology.idl index 7e89d541ad6..1b4b87bd6c3 100644 --- a/include/devicetopology.idl +++ b/include/devicetopology.idl @@ -296,7 +296,7 @@ interface IAudioChannelConfig : IUnknown [ pointer_default(unique), nonextensible, - uuid(7d8b1437-dd53-4350-9c1b-1ee2890bf938), + uuid(7d8b1437-dd53-4350-9c1b-1ee2890bd938), local, object ]

1 0

Alfred Agrell : include: Fix typo in IID_IDWriteStringList.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: b9e48e8b8ad49e156366102a92d2f1d952d0b624 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9e48e8b8ad49e156366102a92d2f1… Author: Alfred Agrell <floating(a)muncher.se> Date: Sun May 5 01:35:54 2024 +0200 include: Fix typo in IID_IDWriteStringList. --- include/dwrite_3.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index e67c8ab6364..7412c3f5857 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -174,7 +174,7 @@ interface IDWriteRenderingParams3 : IDWriteRenderingParams2 [ local, object, - uuid(cfee3140-1257-47ca-8b85-31bfcf3f2d0e) + uuid(cfee3140-1157-47ca-8b85-31bfcf3f2d0e) ] interface IDWriteStringList : IUnknown {

1 0

Alfred Agrell : include: Fix typo in DXGI_DEBUG_APP.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: 6a4494ecd515caea56f32b2f2ac7433a6788962b URL: https://gitlab.winehq.org/wine/wine/-/commit/6a4494ecd515caea56f32b2f2ac743… Author: Alfred Agrell <floating(a)muncher.se> Date: Sun May 5 01:35:54 2024 +0200 include: Fix typo in DXGI_DEBUG_APP. --- include/dxgidebug.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dxgidebug.idl b/include/dxgidebug.idl index 686637321f0..f1c40af2c2b 100644 --- a/include/dxgidebug.idl +++ b/include/dxgidebug.idl @@ -25,7 +25,7 @@ typedef GUID DXGI_DEBUG_ID; cpp_quote("DEFINE_GUID(DXGI_DEBUG_ALL, 0xe48ae283, 0xda80, 0x490b,0x87, 0xe6, 0x43, 0xe9, 0xa9, 0xcf, 0xda, 0x08);") cpp_quote("DEFINE_GUID(DXGI_DEBUG_DX, 0x35cdd7fc, 0x13b2, 0x421d,0xa5, 0xd7, 0x7e, 0x44, 0x51, 0x28, 0x7d, 0x64);") cpp_quote("DEFINE_GUID(DXGI_DEBUG_DXGI, 0x25cddaa4, 0xb1c6, 0x47e1,0xac, 0x3e, 0x98, 0x87, 0x5b, 0x5a, 0x2e, 0x2a);") -cpp_quote("DEFINE_GUID(DXGI_DEBUG_APP, 0x06cd6e01, 0x4219, 0x4ebd,0x87, 0x90, 0x27, 0xed, 0x23, 0x36, 0x0c, 0x62);") +cpp_quote("DEFINE_GUID(DXGI_DEBUG_APP, 0x06cd6e01, 0x4219, 0x4ebd,0x87, 0x09, 0x27, 0xed, 0x23, 0x36, 0x0c, 0x62);") typedef enum DXGI_DEBUG_RLO_FLAGS { DXGI_DEBUG_RLO_SUMMARY = 0x0001,

1 0

Victor Chiletto : vkd3d-shader/d3dbc: Fix implicit enum conversion warning.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: vkd3d Branch: master Commit: 67c690aa070ac447cd95aafb1e7daca1659b9ac7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/67c690aa070ac447cd95aafb1e7da… Author: Victor Chiletto <vchiletto(a)codeweavers.com> Date: Tue Jul 9 18:37:36 2024 -0300 vkd3d-shader/d3dbc: Fix implicit enum conversion warning. This slipped through and broke CI. --- libs/vkd3d-shader/d3dbc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index ea9fe775..4522d56c 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2670,11 +2670,11 @@ static void d3dbc_write_resource_load(struct d3dbc_compiler *d3dbc, const struct case HLSL_RESOURCE_SAMPLE_GRAD: sm1_instr.opcode = D3DSIO_TEXLDD; - sm1_instr.srcs[2].type = D3DSPR_TEMP; + sm1_instr.srcs[2].type = VKD3DSPR_TEMP; sm1_instr.srcs[2].reg = ddx->reg.id; sm1_instr.srcs[2].swizzle = hlsl_swizzle_from_writemask(ddx->reg.writemask); - sm1_instr.srcs[3].type = D3DSPR_TEMP; + sm1_instr.srcs[3].type = VKD3DSPR_TEMP; sm1_instr.srcs[3].reg = ddy->reg.id; sm1_instr.srcs[3].swizzle = hlsl_swizzle_from_writemask(ddy->reg.writemask);

1 0

Austin English : ntoskrnl.exe: Add a stub for KeQueryGroupAffinity.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: 8179609faddee580621529f8b1fffba9a50fb650 URL: https://gitlab.winehq.org/wine/wine/-/commit/8179609faddee580621529f8b1fffb… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jul 9 01:08:16 2024 -0500 ntoskrnl.exe: Add a stub for KeQueryGroupAffinity. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56948 --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7aaf66dd6db..ec67781d9d1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3489,6 +3489,15 @@ ULONG WINAPI KeGetCurrentProcessorNumberEx(PPROCESSOR_NUMBER process_number) return cur_number; } +/*********************************************************************** + * KeQueryGroupAffinity (NTOSKRNL.EXE.@) + */ +KAFFINITY WINAPI KeQueryGroupAffinity(USHORT group_number) +{ + FIXME("%u stub\n", group_number); + return 0; +} + /*********************************************************************** * KeQueryMaximumProcessorCountEx (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 48e1def449c..1bf8ce22fd0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -605,6 +605,7 @@ @ stdcall KeQueryActiveProcessorCountEx(long) @ stdcall KeQueryActiveProcessorCount(ptr) @ stdcall KeQueryActiveGroupCount() GetActiveProcessorGroupCount +@ stdcall KeQueryGroupAffinity(long) @ stdcall KeQueryInterruptTime() @ stdcall KeQueryPriorityThread(ptr) @ stub KeQueryRuntimeThread

1 0

Connor McAdams : d3dx9: Return failure if a cubemap DDS file does not contain all faces.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: 8692b3c0fe7d6e36f1cb4c27d9337a2e956bb715 URL: https://gitlab.winehq.org/wine/wine/-/commit/8692b3c0fe7d6e36f1cb4c27d9337a… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jul 1 06:39:36 2024 -0400 d3dx9: Return failure if a cubemap DDS file does not contain all faces. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/surface.c | 11 +++++------ dlls/d3dx9_36/tests/surface.c | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 6d12872a647..79ee4edcbc1 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -645,14 +645,13 @@ static HRESULT d3dx_initialize_image_from_dds(const void *src_data, uint32_t src } else if (header->caps2 & DDS_CAPS2_CUBEMAP) { - DWORD face; - - faces = 0; - for (face = DDS_CAPS2_CUBEMAP_POSITIVEX; face <= DDS_CAPS2_CUBEMAP_NEGATIVEZ; face <<= 1) + if ((header->caps2 & DDS_CAPS2_CUBEMAP_ALL_FACES) != DDS_CAPS2_CUBEMAP_ALL_FACES) { - if (header->caps2 & face) - faces++; + WARN("Tried to load a partial cubemap DDS file.\n"); + return D3DXERR_INVALIDDATA; } + + faces = 6; image->resource_type = D3DRTYPE_CUBETEXTURE; } else diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index ebca259e551..5fca2f5d64d 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -408,7 +408,7 @@ static void test_dds_header_handling(void) /* Partial cubemaps are not supported. */ { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT), 4, 4, 1, (4 * 4), 1, (DDS_CAPS_TEXTURE | DDS_CAPS_COMPLEX), (DDS_CAPS2_CUBEMAP | DDS_CAPS2_CUBEMAP_POSITIVEX), - { D3DXERR_INVALIDDATA, }, TRUE, FALSE, (64 * 6) }, + { D3DXERR_INVALIDDATA, }, FALSE, FALSE, (64 * 6) }, }; dds = calloc(1, sizeof(*dds));

1 0

Connor McAdams : d3dx9/tests: Add more DDS header tests for cube texture files.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: d36e2a5c3ab5298f652833f076801333b37cae57 URL: https://gitlab.winehq.org/wine/wine/-/commit/d36e2a5c3ab5298f652833f0768013… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jul 1 06:33:36 2024 -0400 d3dx9/tests: Add more DDS header tests for cube texture files. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/tests/surface.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 7c1a33ad2b1..ebca259e551 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -375,31 +375,40 @@ static void test_dds_header_handling(void) D3DRESOURCETYPE resource_type; } expected; - BOOL todo; + BOOL todo_hr; + BOOL todo_info; uint32_t pixel_data_size; } info_tests[] = { /* Depth value set to 4, but no caps bits are set. Depth is ignored. */ { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT), 4, 4, 4, (4 * 4), 3, 0, 0, - { D3D_OK, 4, 4, 1, 3, D3DRTYPE_TEXTURE, }, FALSE, 292 }, + { D3D_OK, 4, 4, 1, 3, D3DRTYPE_TEXTURE, }, FALSE, FALSE, 292 }, /* The volume texture caps2 field is ignored. */ { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT), 4, 4, 4, (4 * 4), 3, (DDS_CAPS_TEXTURE | DDS_CAPS_COMPLEX), DDS_CAPS2_VOLUME, - { D3D_OK, 4, 4, 1, 3, D3DRTYPE_TEXTURE, }, FALSE, 292 }, + { D3D_OK, 4, 4, 1, 3, D3DRTYPE_TEXTURE, }, FALSE, FALSE, 292 }, /* * The DDS_DEPTH flag is the only thing checked to determine if a DDS * file represents a volume texture. */ { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT | DDS_DEPTH), 4, 4, 4, (4 * 4), 3, 0, 0, - { D3D_OK, 4, 4, 4, 3, D3DRTYPE_VOLUMETEXTURE, }, FALSE, 292 }, + { D3D_OK, 4, 4, 4, 3, D3DRTYPE_VOLUMETEXTURE, }, FALSE, FALSE, 292 }, /* Even if the depth field is set to 0, it's still a volume texture. */ { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT | DDS_DEPTH), 4, 4, 0, (4 * 4), 3, 0, 0, - { D3D_OK, 4, 4, 1, 3, D3DRTYPE_VOLUMETEXTURE, }, FALSE, 292 }, + { D3D_OK, 4, 4, 1, 3, D3DRTYPE_VOLUMETEXTURE, }, FALSE, FALSE, 292 }, /* The DDS_DEPTH flag overrides cubemap caps. */ { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT | DDS_DEPTH), 4, 4, 4, (4 * 4), 3, (DDS_CAPS_TEXTURE | DDS_CAPS_COMPLEX), (DDS_CAPS2_CUBEMAP | DDS_CAPS2_CUBEMAP_ALL_FACES), - { D3D_OK, 4, 4, 4, 3, D3DRTYPE_VOLUMETEXTURE, }, FALSE, (292 * 6) }, + { D3D_OK, 4, 4, 4, 3, D3DRTYPE_VOLUMETEXTURE, }, FALSE, FALSE, (292 * 6) }, + /* Cubemap where width field does not equal height. */ + { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT), 4, 5, 1, (4 * 4), 1, + (DDS_CAPS_TEXTURE | DDS_CAPS_COMPLEX), (DDS_CAPS2_CUBEMAP | DDS_CAPS2_CUBEMAP_ALL_FACES), + { D3D_OK, 4, 5, 1, 1, D3DRTYPE_CUBETEXTURE, }, FALSE, FALSE, (80 * 6) }, + /* Partial cubemaps are not supported. */ + { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT), 4, 4, 1, (4 * 4), 1, + (DDS_CAPS_TEXTURE | DDS_CAPS_COMPLEX), (DDS_CAPS2_CUBEMAP | DDS_CAPS2_CUBEMAP_POSITIVEX), + { D3DXERR_INVALIDDATA, }, TRUE, FALSE, (64 * 6) }, }; dds = calloc(1, sizeof(*dds)); @@ -452,12 +461,12 @@ static void test_dds_header_handling(void) memset(&info, 0, sizeof(info)); hr = D3DXGetImageInfoFromFileInMemory(dds, file_size, &info); - ok(hr == info_tests[i].expected.hr, "Unexpected hr %#lx.\n", hr); + todo_wine_if(info_tests[i].todo_hr) ok(hr == info_tests[i].expected.hr, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(info_tests[i].expected.hr)) { check_image_info(&info, info_tests[i].expected.width, info_tests[i].expected.height, info_tests[i].expected.depth, info_tests[i].expected.mip_levels, D3DFMT_X8R8G8B8, - info_tests[i].expected.resource_type, D3DXIFF_DDS, info_tests[i].todo); + info_tests[i].expected.resource_type, D3DXIFF_DDS, info_tests[i].todo_info); } winetest_pop_context(); }

1 0

Connor McAdams : d3dx9: Check the proper flag for DDS files representing a volume texture.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: c621516c05dae821405d9135b095c6619a4d7d3a URL: https://gitlab.winehq.org/wine/wine/-/commit/c621516c05dae821405d9135b095c6… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jul 1 06:17:33 2024 -0400 d3dx9: Check the proper flag for DDS files representing a volume texture. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/surface.c | 4 ++-- dlls/d3dx9_36/tests/surface.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index da23047534b..6d12872a647 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -638,9 +638,9 @@ static HRESULT d3dx_initialize_image_from_dds(const void *src_data, uint32_t src return D3DXERR_INVALIDDATA; TRACE("Pixel format is %#x.\n", image->format); - if (header->caps2 & DDS_CAPS2_VOLUME) + if (header->flags & DDS_DEPTH) { - image->size.depth = header->depth; + image->size.depth = max(header->depth, 1); image->resource_type = D3DRTYPE_VOLUMETEXTURE; } else if (header->caps2 & DDS_CAPS2_CUBEMAP) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 28cad04199f..7c1a33ad2b1 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -384,22 +384,22 @@ static void test_dds_header_handling(void) /* The volume texture caps2 field is ignored. */ { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT), 4, 4, 4, (4 * 4), 3, (DDS_CAPS_TEXTURE | DDS_CAPS_COMPLEX), DDS_CAPS2_VOLUME, - { D3D_OK, 4, 4, 1, 3, D3DRTYPE_TEXTURE, }, TRUE, 292 }, + { D3D_OK, 4, 4, 1, 3, D3DRTYPE_TEXTURE, }, FALSE, 292 }, /* * The DDS_DEPTH flag is the only thing checked to determine if a DDS * file represents a volume texture. */ { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT | DDS_DEPTH), 4, 4, 4, (4 * 4), 3, 0, 0, - { D3D_OK, 4, 4, 4, 3, D3DRTYPE_VOLUMETEXTURE, }, TRUE, 292 }, + { D3D_OK, 4, 4, 4, 3, D3DRTYPE_VOLUMETEXTURE, }, FALSE, 292 }, /* Even if the depth field is set to 0, it's still a volume texture. */ { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT | DDS_DEPTH), 4, 4, 0, (4 * 4), 3, 0, 0, - { D3D_OK, 4, 4, 1, 3, D3DRTYPE_VOLUMETEXTURE, }, TRUE, 292 }, + { D3D_OK, 4, 4, 1, 3, D3DRTYPE_VOLUMETEXTURE, }, FALSE, 292 }, /* The DDS_DEPTH flag overrides cubemap caps. */ { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT | DDS_DEPTH), 4, 4, 4, (4 * 4), 3, (DDS_CAPS_TEXTURE | DDS_CAPS_COMPLEX), (DDS_CAPS2_CUBEMAP | DDS_CAPS2_CUBEMAP_ALL_FACES), - { D3D_OK, 4, 4, 4, 3, D3DRTYPE_VOLUMETEXTURE, }, TRUE, (292 * 6) }, + { D3D_OK, 4, 4, 4, 3, D3DRTYPE_VOLUMETEXTURE, }, FALSE, (292 * 6) }, }; dds = calloc(1, sizeof(*dds));

1 0

Connor McAdams : d3dx9/tests: Add more DDS header tests for volume texture files.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: 478dbad9294d6eed7225596eea5ab4f3f8cbe233 URL: https://gitlab.winehq.org/wine/wine/-/commit/478dbad9294d6eed7225596eea5ab4… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jul 1 06:11:12 2024 -0400 d3dx9/tests: Add more DDS header tests for volume texture files. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/tests/d3dx9_test_images.h | 5 +- dlls/d3dx9_36/tests/surface.c | 90 +++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/d3dx9_test_images.h b/dlls/d3dx9_36/tests/d3dx9_test_images.h index f1e8ffb94bf..bc80fd01c6b 100644 --- a/dlls/d3dx9_36/tests/d3dx9_test_images.h +++ b/dlls/d3dx9_36/tests/d3dx9_test_images.h @@ -430,8 +430,9 @@ static inline void check_image_info_(const char *file, uint32_t line, const D3DX ok_(file, line)(info->MipLevels == mip_levels, "Expected mip_levels %u, got %u.\n", mip_levels, info->MipLevels); ok_(file, line)(info->Format == format, "Expected texture format %d, got %d.\n", format, info->Format); - ok_(file, line)(info->ResourceType == resource_type, "Expected resource_type %d, got %d.\n", resource_type, - info->ResourceType); + todo_wine_if(wine_todo && info->ResourceType != resource_type) + ok_(file, line)(info->ResourceType == resource_type, "Expected resource_type %d, got %d.\n", resource_type, + info->ResourceType); ok_(file, line)(info->ImageFileFormat == image_file_format, "Expected image_file_format %d, got %d.\n", image_file_format, info->ImageFileFormat); } diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 7d9b79c5727..28cad04199f 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -122,10 +122,25 @@ static HRESULT create_file(const char *filename, const unsigned char *data, cons #define DDS_PIXELFORMAT 0x00001000 #define DDS_MIPMAPCOUNT 0x00020000 #define DDS_LINEARSIZE 0x00080000 +#define DDS_PITCH 0x00000008 +#define DDS_DEPTH 0x00800000 /* dds_header.caps */ #define DDSCAPS_ALPHA 0x00000002 #define DDS_CAPS_TEXTURE 0x00001000 +#define DDS_CAPS_COMPLEX 0x00000008 + +#define DDS_CAPS2_VOLUME 0x00200000 +#define DDS_CAPS2_CUBEMAP 0x00000200 +#define DDS_CAPS2_CUBEMAP_POSITIVEX 0x00000400 +#define DDS_CAPS2_CUBEMAP_NEGATIVEX 0x00000800 +#define DDS_CAPS2_CUBEMAP_POSITIVEY 0x00001000 +#define DDS_CAPS2_CUBEMAP_NEGATIVEY 0x00002000 +#define DDS_CAPS2_CUBEMAP_POSITIVEZ 0x00004000 +#define DDS_CAPS2_CUBEMAP_NEGATIVEZ 0x00008000 +#define DDS_CAPS2_CUBEMAP_ALL_FACES ( DDS_CAPS2_CUBEMAP_POSITIVEX | DDS_CAPS2_CUBEMAP_NEGATIVEX \ + | DDS_CAPS2_CUBEMAP_POSITIVEY | DDS_CAPS2_CUBEMAP_NEGATIVEY \ + | DDS_CAPS2_CUBEMAP_POSITIVEZ | DDS_CAPS2_CUBEMAP_NEGATIVEZ ) /* dds_pixel_format.flags */ #define DDS_PF_ALPHA 0x00000001 @@ -340,6 +355,52 @@ static void test_dds_header_handling(void) { { 32, DDS_PF_RGB, 0, 24, 0xff0000, 0x00ff00, 0x0000ff, 0x000000 }, 0, 256, 256, 0, 9, 262146, { D3D_OK, 9 } }, { { 32, DDS_PF_RGB, 0, 24, 0xff0000, 0x00ff00, 0x0000ff, 0x000000 }, 0, 256, 256, 0, 10, 262146, { D3D_OK, 10 } }, }; + struct + { + uint32_t flags; + uint32_t width; + uint32_t height; + uint32_t depth; + uint32_t row_pitch; + uint32_t mip_levels; + uint32_t caps; + uint32_t caps2; + struct + { + HRESULT hr; + uint32_t width; + uint32_t height; + uint32_t depth; + uint32_t mip_levels; + D3DRESOURCETYPE resource_type; + } + expected; + BOOL todo; + uint32_t pixel_data_size; + } info_tests[] = { + /* Depth value set to 4, but no caps bits are set. Depth is ignored. */ + { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT), 4, 4, 4, (4 * 4), 3, 0, 0, + { D3D_OK, 4, 4, 1, 3, D3DRTYPE_TEXTURE, }, FALSE, 292 }, + /* The volume texture caps2 field is ignored. */ + { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT), 4, 4, 4, (4 * 4), 3, + (DDS_CAPS_TEXTURE | DDS_CAPS_COMPLEX), DDS_CAPS2_VOLUME, + { D3D_OK, 4, 4, 1, 3, D3DRTYPE_TEXTURE, }, TRUE, 292 }, + /* + * The DDS_DEPTH flag is the only thing checked to determine if a DDS + * file represents a volume texture. + */ + { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT | DDS_DEPTH), 4, 4, 4, (4 * 4), 3, + 0, 0, + { D3D_OK, 4, 4, 4, 3, D3DRTYPE_VOLUMETEXTURE, }, TRUE, 292 }, + /* Even if the depth field is set to 0, it's still a volume texture. */ + { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT | DDS_DEPTH), 4, 4, 0, (4 * 4), 3, + 0, 0, + { D3D_OK, 4, 4, 1, 3, D3DRTYPE_VOLUMETEXTURE, }, TRUE, 292 }, + /* The DDS_DEPTH flag overrides cubemap caps. */ + { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT | DDS_DEPTH), 4, 4, 4, (4 * 4), 3, + (DDS_CAPS_TEXTURE | DDS_CAPS_COMPLEX), (DDS_CAPS2_CUBEMAP | DDS_CAPS2_CUBEMAP_ALL_FACES), + { D3D_OK, 4, 4, 4, 3, D3DRTYPE_VOLUMETEXTURE, }, TRUE, (292 * 6) }, + }; dds = calloc(1, sizeof(*dds)); if (!dds) @@ -372,6 +433,35 @@ static void test_dds_header_handling(void) } } + for (i = 0; i < ARRAY_SIZE(info_tests); i++) + { + uint32_t file_size = sizeof(dds->magic) + sizeof(dds->header) + info_tests[i].pixel_data_size; + assert(file_size <= sizeof(*dds)); + + winetest_push_context("Test %u", i); + dds->magic = MAKEFOURCC('D','D','S',' '); + fill_dds_header(&dds->header); + dds->header.flags = info_tests[i].flags; + dds->header.width = info_tests[i].width; + dds->header.height = info_tests[i].height; + dds->header.depth = info_tests[i].depth; + dds->header.pitch_or_linear_size = info_tests[i].row_pitch; + dds->header.miplevels = info_tests[i].mip_levels; + dds->header.caps = info_tests[i].caps; + dds->header.caps2 = info_tests[i].caps2; + + memset(&info, 0, sizeof(info)); + hr = D3DXGetImageInfoFromFileInMemory(dds, file_size, &info); + ok(hr == info_tests[i].expected.hr, "Unexpected hr %#lx.\n", hr); + if (SUCCEEDED(info_tests[i].expected.hr)) + { + check_image_info(&info, info_tests[i].expected.width, info_tests[i].expected.height, + info_tests[i].expected.depth, info_tests[i].expected.mip_levels, D3DFMT_X8R8G8B8, + info_tests[i].expected.resource_type, D3DXIFF_DDS, info_tests[i].todo); + } + winetest_pop_context(); + } + free(dds); }

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2024