wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Zebediah Figura : ntdll/tests: Remove some workarounds for no longer supported versions of Windows.
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: 8ac77cfbf96689d83463928a9d0bdc5fcd054cb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ac77cfbf96689d83463928a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 17 19:12:30 2020 -0500 ntdll/tests: Remove some workarounds for no longer supported versions of Windows. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 187 +++++++++++------------------------------------- 1 file changed, 41 insertions(+), 146 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8ac77cfbf96689d83463…

1 0

Gerald Pfeifer : ntdll: Include <signal.h> for sigset_t.
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: f3ca16379d8c06f3342fc3039f4be926325808b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3ca16379d8c06f3342fc303… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jul 18 12:02:58 2020 +0300 ntdll: Include <signal.h> for sigset_t. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/unix_private.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 3cf9ca6673..19f742c200 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -22,6 +22,7 @@ #define __NTDLL_UNIX_PRIVATE_H #include <pthread.h> +#include <signal.h> #include "unixlib.h" #include "wine/list.h"

1 0

Alexandre Julliard : ntdll: Fix a memory leak.
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: b1af31b47aa96ae5f6a8444ffba7a060f7ef6099 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1af31b47aa96ae5f6a8444f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 20 11:45:58 2020 +0200 ntdll: Fix a memory leak. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 74cea11be5..dc81d4e604 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1142,6 +1142,7 @@ NTSTATUS CDECL get_dynamic_environment( WCHAR *env, SIZE_T *size ) } else status = STATUS_BUFFER_TOO_SMALL; *size = pos + 1; + free( buffer ); return status; }

1 0

Ziqing Hui : windowscodecs: Add support for decoding cube maps.
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: 2683be090b470b4787d87259efbb75577347fd02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2683be090b470b4787d87259… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat Jul 18 11:18:22 2020 +0800 windowscodecs: Add support for decoding cube maps. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 23 +++++++++++++++++++++-- dlls/windowscodecs/tests/ddsformat.c | 6 ------ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index b972b41b30..447eaf4178 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -14,6 +14,16 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + * + * Note: + * + * Uncompressed image: + * For uncompressed formats, a block is equivalent to a pixel. + * + * Cube map: + * A cube map is equivalent to a 2D texture array which has 6 textures. + * A cube map array is equivalent to a 2D texture array which has cubeCount*6 textures. */ #include "config.h" @@ -436,6 +446,7 @@ static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *h } info->frame_count *= info->array_size; } + if (info->dimension == WICDdsTextureCube) info->frame_count *= 6; } static inline DdsDecoder *impl_from_IWICBitmapDecoder(IWICBitmapDecoder *iface) @@ -910,7 +921,11 @@ static HRESULT WINAPI DdsDecoder_GetFrame(IWICBitmapDecoder *iface, return WINCODEC_ERR_WRONGSTATE; } - frame_per_texture = This->info.frame_count / This->info.array_size; + if (This->info.dimension == WICDdsTextureCube) { + frame_per_texture = This->info.mip_levels; + } else { + frame_per_texture = This->info.frame_count / This->info.array_size; + } array_index = index / frame_per_texture; slice_index = index % frame_per_texture; depth = This->info.depth; @@ -1021,7 +1036,11 @@ static HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *iface, hr = WINCODEC_ERR_WRONGSTATE; goto end; } - if (arrayIndex >= This->info.array_size || mipLevel >= This->info.mip_levels || sliceIndex >= This->info.depth) { + + if ((arrayIndex >= This->info.array_size && This->info.dimension != WICDdsTextureCube) || + (arrayIndex >= This->info.array_size * 6) || + (mipLevel >= This->info.mip_levels) || + (sliceIndex >= This->info.depth)) { hr = E_INVALIDARG; goto end; } diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index cfe4d9b781..b8ca452a43 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -541,7 +541,6 @@ static void test_dds_decoder_image_parameters(void) hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); ok(hr == S_OK, "Test %u: GetFrameCount failed, hr %#x\n", i, hr); if (hr == S_OK) { - todo_wine_if(test_data[i].expected_parameters.Dimension == WICDdsTextureCube) ok(frame_count == test_data[i].expected_frame_count, "Test %u: Expected frame count %u, got %u\n", i, test_data[i].expected_frame_count, frame_count); } @@ -794,11 +793,6 @@ static void test_dds_decoder_frame(IWICBitmapDecoder *decoder, int i) UINT frame_count, j; WICDdsParameters params; - if (test_data[i].expected_parameters.Dimension == WICDdsTextureCube) { - skip("Frame tests for cube maps will crash\n"); - return; - } - hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); ok(hr == S_OK, "Test %u: GetFrameCount failed, hr %#x\n", i, hr); if (hr != S_OK) return;

1 0

Ziqing Hui : windowscodecs/tests: Add tests for cube maps.
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: bc805bbcd9b5a1235e9b354069fb98ad2d966554 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc805bbcd9b5a1235e9b3540… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat Jul 18 11:17:54 2020 +0800 windowscodecs/tests: Add tests for cube maps. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 98 ++++++++++++++++++++++++++---------- 1 file changed, 71 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bc805bbcd9b5a1235e9b…

1 0

Ziqing Hui : windowscodecs: Add more formats to get_bytes_per_block_from_format().
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: 6b4566dfe7ae82d1be5ed19f779741a299f7d496 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b4566dfe7ae82d1be5ed19f… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat Jul 18 11:17:14 2020 +0800 windowscodecs: Add more formats to get_bytes_per_block_from_format(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 101 +++++++++++++++++++++++++++++++++-- dlls/windowscodecs/tests/ddsformat.c | 6 --- 2 files changed, 98 insertions(+), 9 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 5de3759527..b972b41b30 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -104,7 +104,7 @@ typedef struct dds_info { UINT array_size; UINT frame_count; UINT data_offset; - UINT bytes_per_block; + UINT bytes_per_block; /* for uncompressed format, this means bytes per pixel*/ DXGI_FORMAT format; WICDdsDimension dimension; WICDdsAlphaMode alpha_mode; @@ -115,7 +115,7 @@ typedef struct dds_frame_info { UINT width; UINT height; DXGI_FORMAT format; - UINT bytes_per_block; + UINT bytes_per_block; /* for uncompressed format, this means bytes per pixel*/ UINT block_width; UINT block_height; UINT width_in_blocks; @@ -263,18 +263,113 @@ static WICDdsAlphaMode get_alpha_mode_from_fourcc(DWORD fourcc) static UINT get_bytes_per_block_from_format(DXGI_FORMAT format) { + /* for uncompressed format, return bytes per pixel*/ switch (format) { + case DXGI_FORMAT_R8_TYPELESS: + case DXGI_FORMAT_R8_UNORM: + case DXGI_FORMAT_R8_UINT: + case DXGI_FORMAT_R8_SNORM: + case DXGI_FORMAT_R8_SINT: + case DXGI_FORMAT_A8_UNORM: + return 1; + case DXGI_FORMAT_R8G8_TYPELESS: + case DXGI_FORMAT_R8G8_UNORM: + case DXGI_FORMAT_R8G8_UINT: + case DXGI_FORMAT_R8G8_SNORM: + case DXGI_FORMAT_R8G8_SINT: + case DXGI_FORMAT_R16_TYPELESS: + case DXGI_FORMAT_R16_FLOAT: + case DXGI_FORMAT_D16_UNORM: + case DXGI_FORMAT_R16_UNORM: + case DXGI_FORMAT_R16_UINT: + case DXGI_FORMAT_R16_SNORM: + case DXGI_FORMAT_R16_SINT: + case DXGI_FORMAT_B5G6R5_UNORM: + case DXGI_FORMAT_B5G5R5A1_UNORM: + case DXGI_FORMAT_B4G4R4A4_UNORM: + return 2; + case DXGI_FORMAT_R10G10B10A2_TYPELESS: + case DXGI_FORMAT_R10G10B10A2_UNORM: + case DXGI_FORMAT_R10G10B10A2_UINT: + case DXGI_FORMAT_R11G11B10_FLOAT: + case DXGI_FORMAT_R8G8B8A8_TYPELESS: + case DXGI_FORMAT_R8G8B8A8_UNORM: + case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB: + case DXGI_FORMAT_R8G8B8A8_UINT: + case DXGI_FORMAT_R8G8B8A8_SNORM: + case DXGI_FORMAT_R8G8B8A8_SINT: + case DXGI_FORMAT_R16G16_TYPELESS: + case DXGI_FORMAT_R16G16_FLOAT: + case DXGI_FORMAT_R16G16_UNORM: + case DXGI_FORMAT_R16G16_UINT: + case DXGI_FORMAT_R16G16_SNORM: + case DXGI_FORMAT_R16G16_SINT: + case DXGI_FORMAT_R32_TYPELESS: + case DXGI_FORMAT_D32_FLOAT: + case DXGI_FORMAT_R32_FLOAT: + case DXGI_FORMAT_R32_UINT: + case DXGI_FORMAT_R32_SINT: + case DXGI_FORMAT_R24G8_TYPELESS: + case DXGI_FORMAT_D24_UNORM_S8_UINT: + case DXGI_FORMAT_R24_UNORM_X8_TYPELESS: + case DXGI_FORMAT_X24_TYPELESS_G8_UINT: + case DXGI_FORMAT_R9G9B9E5_SHAREDEXP: + case DXGI_FORMAT_R8G8_B8G8_UNORM: + case DXGI_FORMAT_G8R8_G8B8_UNORM: + case DXGI_FORMAT_B8G8R8A8_UNORM: + case DXGI_FORMAT_B8G8R8X8_UNORM: + case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM: + case DXGI_FORMAT_B8G8R8A8_TYPELESS: + case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB: + case DXGI_FORMAT_B8G8R8X8_TYPELESS: + case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB: + return 4; case DXGI_FORMAT_BC1_UNORM: case DXGI_FORMAT_BC1_TYPELESS: case DXGI_FORMAT_BC1_UNORM_SRGB: + case DXGI_FORMAT_BC4_TYPELESS: + case DXGI_FORMAT_BC4_UNORM: + case DXGI_FORMAT_BC4_SNORM: + case DXGI_FORMAT_R16G16B16A16_TYPELESS: + case DXGI_FORMAT_R16G16B16A16_FLOAT: + case DXGI_FORMAT_R16G16B16A16_UNORM: + case DXGI_FORMAT_R16G16B16A16_UINT: + case DXGI_FORMAT_R16G16B16A16_SNORM: + case DXGI_FORMAT_R16G16B16A16_SINT: + case DXGI_FORMAT_R32G32_TYPELESS: + case DXGI_FORMAT_R32G32_FLOAT: + case DXGI_FORMAT_R32G32_UINT: + case DXGI_FORMAT_R32G32_SINT: + case DXGI_FORMAT_R32G8X24_TYPELESS: + case DXGI_FORMAT_D32_FLOAT_S8X24_UINT: + case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS: + case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT: return 8; + case DXGI_FORMAT_R32G32B32_TYPELESS: + case DXGI_FORMAT_R32G32B32_FLOAT: + case DXGI_FORMAT_R32G32B32_UINT: + case DXGI_FORMAT_R32G32B32_SINT: + return 12; case DXGI_FORMAT_BC2_UNORM: case DXGI_FORMAT_BC2_TYPELESS: case DXGI_FORMAT_BC2_UNORM_SRGB: case DXGI_FORMAT_BC3_UNORM: case DXGI_FORMAT_BC3_TYPELESS: case DXGI_FORMAT_BC3_UNORM_SRGB: + case DXGI_FORMAT_BC5_TYPELESS: + case DXGI_FORMAT_BC5_UNORM: + case DXGI_FORMAT_BC5_SNORM: + case DXGI_FORMAT_BC6H_TYPELESS: + case DXGI_FORMAT_BC6H_UF16: + case DXGI_FORMAT_BC6H_SF16: + case DXGI_FORMAT_BC7_TYPELESS: + case DXGI_FORMAT_BC7_UNORM: + case DXGI_FORMAT_BC7_UNORM_SRGB: + case DXGI_FORMAT_R32G32B32A32_TYPELESS: + case DXGI_FORMAT_R32G32B32A32_FLOAT: + case DXGI_FORMAT_R32G32B32A32_UINT: + case DXGI_FORMAT_R32G32B32A32_SINT: return 16; default: WARN("DXGI format 0x%x is not supported in DDS decoder\n", format); @@ -931,7 +1026,6 @@ static HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *iface, goto end; } - bytes_per_block = This->info.bytes_per_block; if (is_compressed(This->info.format)) { block_width = DDS_BLOCK_WIDTH; block_height = DDS_BLOCK_HEIGHT; @@ -939,6 +1033,7 @@ static HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *iface, block_width = 1; block_height = 1; } + bytes_per_block = This->info.bytes_per_block; seek.QuadPart = This->info.data_offset; width = This->info.width; diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index c5147c3327..2397d8e6b6 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -607,7 +607,6 @@ static void test_dds_decoder_frame_properties(IWICBitmapFrameDecode *frame_decod ok(format_info.DxgiFormat == test_data[i].expected_parameters.DxgiFormat, "Test %u, frame %u: Expected DXGI format %#x, got %#x\n", i, frame_index, test_data[i].expected_parameters.DxgiFormat, format_info.DxgiFormat); - todo_wine_if(i == 4 || i == 5 || i == 6) ok(format_info.BytesPerBlock == test_data[i].expected_bytes_per_block, "Test %u, frame %u: Expected bytes per block %u, got %u\n", i, frame_index, test_data[i].expected_bytes_per_block, format_info.BytesPerBlock); @@ -686,34 +685,29 @@ static void test_dds_decoder_frame_data(IWICDdsFrameDecode *dds_frame, UINT fram ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, frame_stride - 1, sizeof(buffer), buffer); - todo_wine_if(i == 4 || i == 5 || i == 6) ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, frame_stride * 2, sizeof(buffer), buffer); ok(hr == S_OK, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, frame_stride, sizeof(buffer), buffer); ok(hr == S_OK, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, frame_stride, frame_stride * height_in_blocks - 1, buffer); - todo_wine_if(i == 4 || i == 5 || i == 6) ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, frame_stride, frame_stride * height_in_blocks, buffer); ok(hr == S_OK, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, 0, sizeof(buffer), buffer); - todo_wine_if(i == 4 || i == 5 || i == 6) ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride - 1, sizeof(buffer), buffer); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride * 2, sizeof(buffer), buffer); ok(hr == S_OK, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); - todo_wine_if(i == 4 || i == 5 || i == 6) { hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, 0, buffer); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, 1, buffer); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, stride * rect.Height - 1, buffer); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); - } hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, stride * rect.Height, buffer); ok(hr == S_OK, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr);

1 0

Ziqing Hui : windowscodecs: Introduce is_compressed(). And fix some format checks.
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: e74d39c32d4f49d9b983811772f3324bcbe3ce55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e74d39c32d4f49d9b9838117… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat Jul 18 11:15:38 2020 +0800 windowscodecs: Introduce is_compressed(). And fix some format checks. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 37 ++++++++++++++++++++++++++++-------- dlls/windowscodecs/tests/ddsformat.c | 5 ++--- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 41e92a2b48..5de3759527 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -105,7 +105,6 @@ typedef struct dds_info { UINT frame_count; UINT data_offset; UINT bytes_per_block; - BOOL compressed; DXGI_FORMAT format; WICDdsDimension dimension; WICDdsAlphaMode alpha_mode; @@ -187,6 +186,16 @@ static struct dds_format { { { sizeof(DDS_PIXELFORMAT), DDPF_LUMINANCE, 0, 8, 0xFF,0,0,0 }, DXGI_FORMAT_R8_UNORM } }; +static DXGI_FORMAT 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 HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *, UINT, UINT, UINT, IWICBitmapFrameDecode **); static inline BOOL has_extended_header(DDS_HEADER *header) @@ -273,13 +282,22 @@ static UINT get_bytes_per_block_from_format(DXGI_FORMAT format) } } +static BOOL is_compressed(DXGI_FORMAT format) +{ + UINT i; + + for (i = 0; i < ARRAY_SIZE(compressed_formats); i++) + { + if (format == compressed_formats[i]) return TRUE; + } + return FALSE; +} + static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *header_dxt10) { int i; UINT depth; - info->compressed = !(header->ddspf.flags & (DDPF_RGB | DDPF_LUMINANCE)); - info->width = header->width; info->height = header->height; info->depth = 1; @@ -303,10 +321,10 @@ static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *h info->pixel_format = (info->alpha_mode == WICDdsAlphaModePremultiplied) ? &GUID_WICPixelFormat32bppPBGRA : &GUID_WICPixelFormat32bppBGRA; - if (info->compressed) { - info->bytes_per_block = get_bytes_per_block_from_format(info->format); - } else { + if (header->ddspf.flags & (DDPF_RGB | DDPF_ALPHA | DDPF_LUMINANCE)) { info->bytes_per_block = header->ddspf.rgbBitCount / 8; + } else { + info->bytes_per_block = get_bytes_per_block_from_format(info->format); } /* get frame count */ @@ -685,7 +703,10 @@ static HRESULT WINAPI DdsDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p hr = IWICWineDecoder_Initialize(&This->IWICWineDecoder_iface, pIStream, cacheOptions); if (FAILED(hr)) goto end; - if (!This->info.compressed || This->info.dimension == WICDdsTextureCube) { + if (This->info.dimension == WICDdsTextureCube || + (This->info.format != DXGI_FORMAT_BC1_UNORM && + This->info.format != DXGI_FORMAT_BC2_UNORM && + This->info.format != DXGI_FORMAT_BC3_UNORM)) { IStream_Release(pIStream); This->stream = NULL; This->initialized = FALSE; @@ -911,7 +932,7 @@ static HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *iface, } bytes_per_block = This->info.bytes_per_block; - if (This->info.compressed) { + if (is_compressed(This->info.format)) { block_width = DDS_BLOCK_WIDTH; block_height = DDS_BLOCK_HEIGHT; } else { diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index f1141c15a0..c5147c3327 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -331,7 +331,6 @@ static HRESULT init_decoder(IWICBitmapDecoder *decoder, IWICStream *stream, HRES if (index == -1) { ok(hr == S_OK || wine_init, "Decoder initialize failed, hr %#x\n", hr); } else { - todo_wine_if(index == 9 || index == 10 || index == 11) ok(hr == expected, "Test %u: Expected hr %#x, got %#x\n", index, expected, hr); } @@ -608,7 +607,7 @@ static void test_dds_decoder_frame_properties(IWICBitmapFrameDecode *frame_decod ok(format_info.DxgiFormat == test_data[i].expected_parameters.DxgiFormat, "Test %u, frame %u: Expected DXGI format %#x, got %#x\n", i, frame_index, test_data[i].expected_parameters.DxgiFormat, format_info.DxgiFormat); - todo_wine_if(i == 4 || i == 5 || i == 6) { + todo_wine_if(i == 4 || i == 5 || i == 6) ok(format_info.BytesPerBlock == test_data[i].expected_bytes_per_block, "Test %u, frame %u: Expected bytes per block %u, got %u\n", i, frame_index, test_data[i].expected_bytes_per_block, format_info.BytesPerBlock); @@ -618,7 +617,7 @@ static void test_dds_decoder_frame_properties(IWICBitmapFrameDecode *frame_decod ok(format_info.BlockHeight == expected_block_height, "Test %u, frame %u: Expected block height %u, got %u\n", i, frame_index, expected_block_height, format_info.BlockHeight); - } + /* size in blocks tests */

1 0

Ziqing Hui : windowscodecs/tests: Add tests for DDS images with fourCC which are also uncompressed.
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: 15f04f5779032d02f87a337b1f5df7a5756e191f URL: https://source.winehq.org/git/wine.git/?a=commit;h=15f04f5779032d02f87a337b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat Jul 18 11:15:13 2020 +0800 windowscodecs/tests: Add tests for DDS images with fourCC which are also uncompressed. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 75 +++++++++++++++++++++++++++++++----- 1 file changed, 66 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=15f04f5779032d02f87a…

1 0

Ziqing Hui : windowscodecs: Add more supported DXGI formats for DDS decoder. And return the actual formats for uncompressed DDS images.
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: 0b676b55cc45e6b0c2045a78190154580c85de00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b676b55cc45e6b0c2045a78… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat Jul 18 11:14:48 2020 +0800 windowscodecs: Add more supported DXGI formats for DDS decoder. And return the actual formats for uncompressed DDS images. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 80 ++++++++++++++++++++++++++---------- dlls/windowscodecs/tests/ddsformat.c | 16 +++++--- 2 files changed, 70 insertions(+), 26 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 527da1d6b3..41e92a2b48 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -143,6 +143,50 @@ typedef struct DdsFrameDecode { dds_frame_info info; } DdsFrameDecode; +static struct dds_format { + DDS_PIXELFORMAT pixel_format; + DXGI_FORMAT dxgi_format; +} dds_formats[] = { + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '1'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_BC1_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '2'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_BC2_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '3'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_BC2_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '4'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_BC3_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '5'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_BC3_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('B', 'C', '4', 'U'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_BC4_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('B', 'C', '4', 'S'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_BC4_SNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('B', 'C', '5', 'U'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_BC5_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('B', 'C', '5', 'S'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_BC5_SNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('A', 'T', 'I', '1'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_BC4_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('A', 'T', 'I', '2'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_BC5_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('R', 'G', 'B', 'G'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_R8G8_B8G8_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('G', 'R', 'G', 'B'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_G8R8_G8B8_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', '1', '0'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_UNKNOWN }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, 0x24, 0, 0, 0, 0, 0 }, DXGI_FORMAT_R16G16B16A16_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, 0x6E, 0, 0, 0, 0, 0 }, DXGI_FORMAT_R16G16B16A16_SNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, 0x6F, 0, 0, 0, 0, 0 }, DXGI_FORMAT_R16_FLOAT }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, 0x70, 0, 0, 0, 0, 0 }, DXGI_FORMAT_R16G16_FLOAT }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, 0x71, 0, 0, 0, 0, 0 }, DXGI_FORMAT_R16G16B16A16_FLOAT }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, 0x72, 0, 0, 0, 0, 0 }, DXGI_FORMAT_R32_FLOAT }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, 0x73, 0, 0, 0, 0, 0 }, DXGI_FORMAT_R32G32_FLOAT }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, 0x74, 0, 0, 0, 0, 0 }, DXGI_FORMAT_R32G32B32A32_FLOAT }, + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 32, 0xFF,0xFF00,0xFF0000,0xFF000000 }, DXGI_FORMAT_R8G8B8A8_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 32, 0xFF0000,0xFF00,0xFF,0xFF000000 }, DXGI_FORMAT_B8G8R8A8_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 32, 0xFF0000,0xFF00,0xFF,0 }, DXGI_FORMAT_B8G8R8X8_UNORM }, + /* The red and blue masks are swapped for DXGI_FORMAT_R10G10B10A2_UNORM. + * For "correct" one, the RGB masks should be 0x3FF00000,0xFFC00,0x3FF. + * see: https://walbourn.github.io/dds-update-and-1010102-problems */ + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 32, 0x3FF,0xFFC00,0x3FF00000,0xC0000000 }, DXGI_FORMAT_R10G10B10A2_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB , 0, 32, 0xFFFF,0xFFFF0000,0,0 }, DXGI_FORMAT_R16G16_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB , 0, 32, 0xFFFFFFFF,0,0,0 }, DXGI_FORMAT_R32_FLOAT }, + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 16, 0xF800,0x7E0,0x1F,0 }, DXGI_FORMAT_B5G6R5_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 16, 0x7C00,0x3E0,0x1F,0x8000 }, DXGI_FORMAT_B5G5R5A1_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 16, 0xF00,0xF0,0xF,0xF000 }, DXGI_FORMAT_B4G4R4A4_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_ALPHA, 0, 8, 0,0,0,0xFF }, DXGI_FORMAT_A8_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_LUMINANCE, 0, 16, 0xFFFF,0,0,0 }, DXGI_FORMAT_R16_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_LUMINANCE, 0, 16, 0xFF,0,0,0xFF00 }, DXGI_FORMAT_R8G8_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_LUMINANCE, 0, 8, 0xFF,0,0,0 }, DXGI_FORMAT_R8_UNORM } +}; + static HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *, UINT, UINT, UINT, IWICBitmapFrameDecode **); static inline BOOL has_extended_header(DDS_HEADER *header) @@ -173,25 +217,23 @@ static WICDdsDimension get_dimension(DDS_HEADER *header, DDS_HEADER_DXT10 *heade } } -static DXGI_FORMAT get_format_from_fourcc(DWORD fourcc) +static DXGI_FORMAT get_dxgi_format(DDS_PIXELFORMAT *pixel_format) { - switch (fourcc) + UINT i; + + for (i = 0; i < ARRAY_SIZE(dds_formats); i++) { - case MAKEFOURCC('D', 'X', 'T', '1'): - return DXGI_FORMAT_BC1_UNORM; - case MAKEFOURCC('D', 'X', 'T', '2'): - case MAKEFOURCC('D', 'X', 'T', '3'): - return DXGI_FORMAT_BC2_UNORM; - case MAKEFOURCC('D', 'X', 'T', '4'): - case MAKEFOURCC('D', 'X', 'T', '5'): - return DXGI_FORMAT_BC3_UNORM; - case MAKEFOURCC('D', 'X', '1', '0'): - /* format is indicated in extended header */ - return DXGI_FORMAT_UNKNOWN; - default: - /* there are DDS files where fourCC is set directly to DXGI_FORMAT enumeration value */ - return fourcc; + if ((pixel_format->flags & dds_formats[i].pixel_format.flags) && + (pixel_format->fourCC == dds_formats[i].pixel_format.fourCC) && + (pixel_format->rgbBitCount == dds_formats[i].pixel_format.rgbBitCount) && + (pixel_format->rBitMask == dds_formats[i].pixel_format.rBitMask) && + (pixel_format->gBitMask == dds_formats[i].pixel_format.gBitMask) && + (pixel_format->bBitMask == dds_formats[i].pixel_format.bBitMask) && + (pixel_format->aBitMask == dds_formats[i].pixel_format.aBitMask)) + return dds_formats[i].dxgi_format; } + + return DXGI_FORMAT_UNKNOWN; } static WICDdsAlphaMode get_alpha_mode_from_fourcc(DWORD fourcc) @@ -253,11 +295,7 @@ static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *h info->alpha_mode = header_dxt10->miscFlags2 & 0x00000008; info->data_offset = sizeof(DWORD) + sizeof(*header) + sizeof(*header_dxt10); } else { - if (info->compressed) { - info->format = get_format_from_fourcc(header->ddspf.fourCC); - } else { - info->format = DXGI_FORMAT_R8G8B8A8_UNORM; - } + info->format = get_dxgi_format(&header->ddspf); info->dimension = get_dimension(header, NULL); info->alpha_mode = get_alpha_mode_from_fourcc(header->ddspf.fourCC); info->data_offset = sizeof(DWORD) + sizeof(*header); diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index d6b1e174c6..90333dee40 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -213,13 +213,13 @@ static struct test_data { BOOL wine_init; } test_data[] = { { test_dds_bgr565, sizeof(test_dds_bgr565), 1, 2, &GUID_WICPixelFormat32bppBGRA, - { 4, 4, 1, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, + { 4, 4, 1, 1, 1, DXGI_FORMAT_B5G6R5_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, { test_dds_24bpp, sizeof(test_dds_24bpp), 1, 3, &GUID_WICPixelFormat32bppBGRA, - { 1, 1, 1, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, + { 1, 1, 1, 1, 1, DXGI_FORMAT_UNKNOWN, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, { test_dds_32bpp_xrgb, sizeof(test_dds_32bpp_xrgb), 1, 4, &GUID_WICPixelFormat32bppBGRA, - { 1, 1, 1, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, + { 1, 1, 1, 1, 1, DXGI_FORMAT_B8G8R8X8_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, { test_dds_32bpp_argb, sizeof(test_dds_32bpp_argb), 1, 4, &GUID_WICPixelFormat32bppBGRA, - { 1, 1, 1, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, + { 1, 1, 1, 1, 1, DXGI_FORMAT_B8G8R8A8_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, { test_dds_dxt1, sizeof(test_dds_dxt1), 1, 8, &GUID_WICPixelFormat32bppPBGRA, { 4, 4, 1, 1, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTexture2D, WICDdsAlphaModePremultiplied } }, { test_dds_mipmaps, sizeof(test_dds_mipmaps), 3, 8, &GUID_WICPixelFormat32bppPBGRA, @@ -535,7 +535,13 @@ static void test_dds_decoder_frame_properties(IWICBitmapFrameDecode *frame_decod /* frame format information tests */ - if (test_data[i].expected_parameters.DxgiFormat == DXGI_FORMAT_R8G8B8A8_UNORM) { + if (test_data[i].expected_parameters.DxgiFormat != DXGI_FORMAT_BC1_UNORM && + test_data[i].expected_parameters.DxgiFormat != DXGI_FORMAT_BC2_UNORM && + test_data[i].expected_parameters.DxgiFormat != DXGI_FORMAT_BC3_UNORM && + test_data[i].expected_parameters.DxgiFormat != DXGI_FORMAT_BC4_UNORM && + test_data[i].expected_parameters.DxgiFormat != DXGI_FORMAT_BC4_SNORM && + test_data[i].expected_parameters.DxgiFormat != DXGI_FORMAT_BC5_UNORM && + test_data[i].expected_parameters.DxgiFormat != DXGI_FORMAT_BC5_SNORM) { expected_block_width = 1; expected_block_height = 1; } else {

1 0

Ziqing Hui : windowscodecs/tests: Add more RGB images for DDS tests.
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: c801bde2f0c592c39c00ac60960c23397310d7e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c801bde2f0c592c39c00ac60… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat Jul 18 11:14:22 2020 +0800 windowscodecs/tests: Add more RGB images for DDS tests. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 136 +++++++++++++++++++++++------------ 1 file changed, 92 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c801bde2f0c592c39c00…

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
83
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 2020