August 2020 - Wine-commits - list.winehq.org

Biswapriyo Nath : include/xaudio2.idl: Use cpp_quote for xaudio2 error codes.
by Alexandre Julliard 19 Aug '20

19 Aug '20

Module: wine Branch: master Commit: 3076d37af8b91805945fd81f59c9a512cbcf8f73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3076d37af8b91805945fd81f… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Aug 13 11:05:49 2020 +0530 include/xaudio2.idl: Use cpp_quote for xaudio2 error codes. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/xaudio2.idl | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/include/xaudio2.idl b/include/xaudio2.idl index 074454d490..3201e86e31 100644 --- a/include/xaudio2.idl +++ b/include/xaudio2.idl @@ -1243,15 +1243,16 @@ const UINT32 XAUDIO2_QUANTUM_NUMERATOR = 1; const UINT32 XAUDIO2_QUANTUM_DENOMINATOR = 100; const float XAUDIO2_QUANTUM_MS = (1000.0 * XAUDIO2_QUANTUM_NUMERATOR / XAUDIO2_QUANTUM_DENOMINATOR); -const HRESULT XAUDIO2_E_INVALID_CALL = 0x88960001; -const HRESULT XAUDIO2_E_XMA_DECODER_ERROR = 0x88960002; -const HRESULT XAUDIO2_E_XAPO_CREATION_FAILED = 0x88960003; -const HRESULT XAUDIO2_E_DEVICE_INVALIDATED = 0x88960004; +/* use cpp_quote to retain the HRESULT type in header file */ +cpp_quote("#define XAUDIO2_E_INVALID_CALL ((HRESULT)0x88960001)") +cpp_quote("#define XAUDIO2_E_XMA_DECODER_ERROR ((HRESULT)0x88960002)") +cpp_quote("#define XAUDIO2_E_XAPO_CREATION_FAILED ((HRESULT)0x88960003)") +cpp_quote("#define XAUDIO2_E_DEVICE_INVALIDATED ((HRESULT)0x88960004)") /* xaudio 2.0 error codes */ -const HRESULT XAUDIO20_E_XMA_DECODER_ERROR = 0x88960001; -const HRESULT XAUDIO20_E_XAPO_CREATION_FAILED = 0x88960002; -const HRESULT XAUDIO20_E_DEVICE_INVALIDATED = 0x88960003; +cpp_quote("#define XAUDIO20_E_XMA_DECODER_ERROR ((HRESULT)0x88960001)") +cpp_quote("#define XAUDIO20_E_XAPO_CREATION_FAILED ((HRESULT)0x88960002)") +cpp_quote("#define XAUDIO20_E_DEVICE_INVALIDATED ((HRESULT)0x88960003)") cpp_quote("#ifdef XAUDIO2_HELPER_FUNCTIONS") cpp_quote("#define _USE_MATH_DEFINES")

1 0

Paul Gofman : ntdll: Report newer vector processor features on x86 / x64.
by Alexandre Julliard 19 Aug '20

19 Aug '20

Module: wine Branch: master Commit: 525e7078a83f568d10183327ab3fa6b82d08d41b URL: https://source.winehq.org/git/wine.git/?a=commit;h=525e7078a83f568d10183327… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Aug 17 18:48:36 2020 +0300 ntdll: Report newer vector processor features on x86 / x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 14 +++++++++++++- include/winnt.h | 6 ++++++ include/winternl.h | 6 ++++++ programs/wineboot/wineboot.c | 5 +++++ 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 3148f23df3..9d82a6774c 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -190,6 +190,7 @@ __ASM_GLOBAL_FUNC( do_cpuid, "pushl %ebx\n\t" "movl 12(%esp),%eax\n\t" "movl 16(%esp),%esi\n\t" + "xorl %ecx,%ecx\n\t" "cpuid\n\t" "movl %eax,(%esi)\n\t" "movl %ebx,4(%esi)\n\t" @@ -202,6 +203,7 @@ __ASM_GLOBAL_FUNC( do_cpuid, __ASM_GLOBAL_FUNC( do_cpuid, "pushq %rbx\n\t" "movl %edi,%eax\n\t" + "xorl %ecx,%ecx\n\t" "cpuid\n\t" "movl %eax,(%rsi)\n\t" "movl %ebx,4(%rsi)\n\t" @@ -277,7 +279,7 @@ static inline BOOL have_sse_daz_mode(void) static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) { - unsigned int regs[4], regs2[4]; + unsigned int regs[4], regs2[4], regs3[4]; #if defined(__i386__) info->Architecture = PROCESSOR_ARCHITECTURE_INTEL; @@ -308,11 +310,21 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) if (regs2[3] & (1 << 25)) info->FeatureSet |= CPU_FEATURE_SSE; if (regs2[3] & (1 << 26)) info->FeatureSet |= CPU_FEATURE_SSE2; if (regs2[2] & (1 << 0 )) info->FeatureSet |= CPU_FEATURE_SSE3; + if (regs2[2] & (1 << 9 )) info->FeatureSet |= CPU_FEATURE_SSSE3; if (regs2[2] & (1 << 13)) info->FeatureSet |= CPU_FEATURE_CX128; + if (regs2[2] & (1 << 19)) info->FeatureSet |= CPU_FEATURE_SSE41; + if (regs2[2] & (1 << 20)) info->FeatureSet |= CPU_FEATURE_SSE42; if (regs2[2] & (1 << 27)) info->FeatureSet |= CPU_FEATURE_XSAVE; + if (regs2[2] & (1 << 28)) info->FeatureSet |= CPU_FEATURE_AVX; if((regs2[3] & (1 << 26)) && (regs2[3] & (1 << 24)) && have_sse_daz_mode()) /* has SSE2 and FXSAVE/FXRSTOR */ info->FeatureSet |= CPU_FEATURE_DAZ; + if (regs[0] >= 0x00000007) + { + do_cpuid( 0x00000007, regs3 ); /* get extended features */ + if (regs3[1] & (1 << 5)) info->FeatureSet |= CPU_FEATURE_AVX2; + } + if (regs[1] == AUTH && regs[3] == ENTI && regs[2] == CAMD) { info->Level = (regs2[0] >> 8) & 0xf; /* family */ diff --git a/include/winnt.h b/include/winnt.h index 6aef97595d..ac89ebc5ef 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -928,6 +928,12 @@ typedef enum _HEAP_INFORMATION_CLASS { #define PF_RDPID_INSTRUCTION_AVAILABLE 33 #define PF_ARM_V81_ATOMIC_INSTRUCTIONS_AVAILABLE 34 #define PF_MONITORX_INSTRUCTION_AVAILABLE 35 +#define PF_SSSE3_INSTRUCTIONS_AVAILABLE 36 +#define PF_SSE4_1_INSTRUCTIONS_AVAILABLE 37 +#define PF_SSE4_2_INSTRUCTIONS_AVAILABLE 38 +#define PF_AVX_INSTRUCTIONS_AVAILABLE 39 +#define PF_AVX2_INSTRUCTIONS_AVAILABLE 40 +#define PF_AVX512F_INSTRUCTIONS_AVAILABLE 41 /* Execution state flags */ diff --git a/include/winternl.h b/include/winternl.h index 8efdaf3119..6c80919397 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1681,6 +1681,12 @@ typedef struct _SYSTEM_CPU_INFORMATION { #define CPU_FEATURE_NX 0x20000000 /* Data execution prevention */ /* FIXME: following values are made up, actual flags are unknown */ +#define CPU_FEATURE_SSSE3 0x00008000 /* SSSE3 instructions */ +#define CPU_FEATURE_SSE41 0x01000000 /* SSE41 instructions */ +#define CPU_FEATURE_SSE42 0x02000000 /* SSE42 instructions */ +#define CPU_FEATURE_AVX 0x40000000 /* AVX instructions */ +#define CPU_FEATURE_AVX2 0x80000000 /* AVX2 instructions */ + #define CPU_FEATURE_PAE 0x00200000 #define CPU_FEATURE_DAZ 0x00400000 #define CPU_FEATURE_ARM_VFP_32 0x00000001 diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 21be0f55fb..902f6af042 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -248,6 +248,7 @@ static void create_user_shared_data(void) features[PF_PAE_ENABLED] = !!(sci.FeatureSet & CPU_FEATURE_PAE); features[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = !!(sci.FeatureSet & CPU_FEATURE_SSE2); features[PF_SSE3_INSTRUCTIONS_AVAILABLE] = !!(sci.FeatureSet & CPU_FEATURE_SSE3); + features[PF_SSSE3_INSTRUCTIONS_AVAILABLE] = !!(sci.FeatureSet & CPU_FEATURE_SSSE3); features[PF_XSAVE_ENABLED] = !!(sci.FeatureSet & CPU_FEATURE_XSAVE); features[PF_COMPARE_EXCHANGE128] = !!(sci.FeatureSet & CPU_FEATURE_CX128); features[PF_SSE_DAZ_MODE_AVAILABLE] = !!(sci.FeatureSet & CPU_FEATURE_DAZ); @@ -256,6 +257,10 @@ static void create_user_shared_data(void) features[PF_VIRT_FIRMWARE_ENABLED] = !!(sci.FeatureSet & CPU_FEATURE_VIRT); features[PF_RDWRFSGSBASE_AVAILABLE] = !!(sci.FeatureSet & CPU_FEATURE_RDFS); features[PF_FASTFAIL_AVAILABLE] = TRUE; + features[PF_SSE4_1_INSTRUCTIONS_AVAILABLE] = !!(sci.FeatureSet & CPU_FEATURE_SSE41); + features[PF_SSE4_2_INSTRUCTIONS_AVAILABLE] = !!(sci.FeatureSet & CPU_FEATURE_SSE42); + features[PF_AVX_INSTRUCTIONS_AVAILABLE] = !!(sci.FeatureSet & CPU_FEATURE_AVX); + features[PF_AVX2_INSTRUCTIONS_AVAILABLE] = !!(sci.FeatureSet & CPU_FEATURE_AVX2); break; case PROCESSOR_ARCHITECTURE_ARM: features[PF_ARM_VFP_32_REGISTERS_AVAILABLE] = !!(sci.FeatureSet & CPU_FEATURE_ARM_VFP_32);

1 0

Paul Gofman : ntdll: Don't transfer xmm registers explicitly during context save and restore on x64.
by Alexandre Julliard 19 Aug '20

19 Aug '20

Module: wine Branch: master Commit: f332f2e4e28e9618e7b4a65e9352915cf9772e93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f332f2e4e28e9618e7b4a65e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Aug 18 02:11:59 2020 +0300 ntdll: Don't transfer xmm registers explicitly during context save and restore on x64. fxsave / fxrstor already do that. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 18 +----------------- dlls/ntdll/unix/signal_x86_64.c | 18 +----------------- 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index faf24b93b5..40ed53c10d 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -340,23 +340,7 @@ __ASM_GLOBAL_FUNC( RtlCaptureContext, "movq %r15,0xf0(%rcx)\n\t" /* context->R15 */ "movq (%rsp),%rax\n\t" "movq %rax,0xf8(%rcx)\n\t" /* context->Rip */ - "fxsave 0x100(%rcx)\n\t" /* context->FtlSave */ - "movdqa %xmm0,0x1a0(%rcx)\n\t" /* context->Xmm0 */ - "movdqa %xmm1,0x1b0(%rcx)\n\t" /* context->Xmm1 */ - "movdqa %xmm2,0x1c0(%rcx)\n\t" /* context->Xmm2 */ - "movdqa %xmm3,0x1d0(%rcx)\n\t" /* context->Xmm3 */ - "movdqa %xmm4,0x1e0(%rcx)\n\t" /* context->Xmm4 */ - "movdqa %xmm5,0x1f0(%rcx)\n\t" /* context->Xmm5 */ - "movdqa %xmm6,0x200(%rcx)\n\t" /* context->Xmm6 */ - "movdqa %xmm7,0x210(%rcx)\n\t" /* context->Xmm7 */ - "movdqa %xmm8,0x220(%rcx)\n\t" /* context->Xmm8 */ - "movdqa %xmm9,0x230(%rcx)\n\t" /* context->Xmm9 */ - "movdqa %xmm10,0x240(%rcx)\n\t" /* context->Xmm10 */ - "movdqa %xmm11,0x250(%rcx)\n\t" /* context->Xmm11 */ - "movdqa %xmm12,0x260(%rcx)\n\t" /* context->Xmm12 */ - "movdqa %xmm13,0x270(%rcx)\n\t" /* context->Xmm13 */ - "movdqa %xmm14,0x280(%rcx)\n\t" /* context->Xmm14 */ - "movdqa %xmm15,0x290(%rcx)\n\t" /* context->Xmm15 */ + "fxsave 0x100(%rcx)\n\t" /* context->FltSave */ "ret" ); /****************************************************************************** diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index a1918908fc..6f01b76c5a 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1507,23 +1507,7 @@ __ASM_GLOBAL_FUNC( set_full_cpu_context, "movq 0xf0(%rdi),%r15\n\t" /* context->R15 */ "movq 0xf8(%rdi),%rax\n\t" /* context->Rip */ "movq %rax,(%rsp)\n\t" - "fxrstor 0x100(%rdi)\n\t" /* context->FtlSave */ - "movdqa 0x1a0(%rdi),%xmm0\n\t" /* context->Xmm0 */ - "movdqa 0x1b0(%rdi),%xmm1\n\t" /* context->Xmm1 */ - "movdqa 0x1c0(%rdi),%xmm2\n\t" /* context->Xmm2 */ - "movdqa 0x1d0(%rdi),%xmm3\n\t" /* context->Xmm3 */ - "movdqa 0x1e0(%rdi),%xmm4\n\t" /* context->Xmm4 */ - "movdqa 0x1f0(%rdi),%xmm5\n\t" /* context->Xmm5 */ - "movdqa 0x200(%rdi),%xmm6\n\t" /* context->Xmm6 */ - "movdqa 0x210(%rdi),%xmm7\n\t" /* context->Xmm7 */ - "movdqa 0x220(%rdi),%xmm8\n\t" /* context->Xmm8 */ - "movdqa 0x230(%rdi),%xmm9\n\t" /* context->Xmm9 */ - "movdqa 0x240(%rdi),%xmm10\n\t" /* context->Xmm10 */ - "movdqa 0x250(%rdi),%xmm11\n\t" /* context->Xmm11 */ - "movdqa 0x260(%rdi),%xmm12\n\t" /* context->Xmm12 */ - "movdqa 0x270(%rdi),%xmm13\n\t" /* context->Xmm13 */ - "movdqa 0x280(%rdi),%xmm14\n\t" /* context->Xmm14 */ - "movdqa 0x290(%rdi),%xmm15\n\t" /* context->Xmm15 */ + "fxrstor 0x100(%rdi)\n\t" /* context->FltSave */ "movq 0x78(%rdi),%rax\n\t" /* context->Rax */ "movq 0xb0(%rdi),%rdi\n\t" /* context->Rdi */ "iretq" );

1 0

Louis Lenders : explorerframe: Return S_OK in ITaskbarList::RegisterTab.
by Alexandre Julliard 19 Aug '20

19 Aug '20

Module: wine Branch: master Commit: 2b85d7e21cd86fdc3fef955d73c927c27b8a26f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b85d7e21cd86fdc3fef955d… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Aug 18 13:41:08 2020 +0200 explorerframe: Return S_OK in ITaskbarList::RegisterTab. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49719 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/taskbarlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index 1a0eb7567d..6f24f35992 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -161,7 +161,7 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_RegisterTab(ITaskbarList4 *iface, { FIXME("iface %p, hwndTab %p, hwndMDI %p stub!\n", iface, hwndTab, hwndMDI); - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE taskbar_list_UnregisterTab(ITaskbarList4 *iface, HWND hwndTab)

1 0

Gijs Vermeulen : evr: Fix typo in video_mixer_init_dxva_videodesc() (Coverity).
by Alexandre Julliard 19 Aug '20

19 Aug '20

Module: wine Branch: master Commit: 7c229f647bef384441edc8e730b9436c6ffacb9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c229f647bef384441edc8e7… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Aug 18 14:34:38 2020 +0200 evr: Fix typo in video_mixer_init_dxva_videodesc() (Coverity). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 7b9949b01d..d92bb6c170 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -545,7 +545,7 @@ static HRESULT video_mixer_init_dxva_videodesc(IMFMediaType *media_type, DXVA2_V memset(video_desc, 0, sizeof(*video_desc)); video_desc->SampleWidth = video_format->videoInfo.dwWidth; - video_desc->SampleWidth = video_format->videoInfo.dwHeight; + video_desc->SampleHeight = video_format->videoInfo.dwHeight; video_desc->Format = video_format->surfaceInfo.Format; done:

1 0

Ziqing Hui : windowscodecs/tests: Fix a variable name typo in decode_bc1().
by Alexandre Julliard 19 Aug '20

19 Aug '20

Module: wine Branch: master Commit: 5e000b1830d4b7392e2667def06afafd5f3c141a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e000b1830d4b7392e2667de… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Aug 19 10:02:05 2020 +0800 windowscodecs/tests: Fix a variable name typo in decode_bc1(). 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 989f4317c0..a4022fc2c4 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -573,7 +573,7 @@ static void decode_bc1(const BYTE *blocks, UINT block_count, UINT width, UINT he ((GET_RGB565_B(color[0]) + GET_RGB565_B(color[1]) * 2 + 1) / 3)); } - color_indices = blocks + 4; + color_indices = block + 4; for (j = 0; j < 16; j++, pixel_index++) { if ((pixel_index % stride >= width) ||

1 0

Ziqing Hui : windowscodecs/tests: Add tests for decoding BC2 format.
by Alexandre Julliard 19 Aug '20

19 Aug '20

Module: wine Branch: master Commit: e23516daf22b690cca5c2566c2ccfb36c98bdee7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e23516daf22b690cca5c2566… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Aug 19 10:02:35 2020 +0800 windowscodecs/tests: Add tests for decoding BC2 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/tests/ddsformat.c | 69 +++++++++++++++++++++++++++++++----- 1 file changed, 61 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index a4022fc2c4..8f283b3f0f 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -535,11 +535,11 @@ end: return bpp; } -static DWORD rgb565_to_argb(WORD color, BOOL has_alpha) +static DWORD rgb565_to_argb(WORD color, BYTE alpha) { - return (has_alpha && !color) ? 0: MAKE_ARGB(0xFF, (GET_RGB565_R(color) * 0xFF + 0x0F) / 0x1F, - (GET_RGB565_G(color) * 0xFF + 0x1F) / 0x3F, - (GET_RGB565_B(color) * 0xFF + 0x0F) / 0x1F); + return MAKE_ARGB(alpha, (GET_RGB565_R(color) * 0xFF + 0x0F) / 0x1F, + (GET_RGB565_G(color) * 0xFF + 0x1F) / 0x3F, + (GET_RGB565_B(color) * 0xFF + 0x0F) / 0x1F); } static void decode_bc1(const BYTE *blocks, UINT block_count, UINT width, UINT height, DWORD *buffer) @@ -580,12 +580,55 @@ static void decode_bc1(const BYTE *blocks, UINT block_count, UINT width, UINT he (pixel_index / stride >= height)) continue; color_index = (color_indices[j / 4] >> ((j % 4) * 2)) & 0x3; - *pixel = rgb565_to_argb(color[color_index], has_alpha); + *pixel = (has_alpha && !color[color_index])? 0: rgb565_to_argb(color[color_index], 0xFF); pixel++; } } } +static void decode_bc2(const BYTE *blocks, UINT block_count, UINT width, UINT height, DWORD *buffer) +{ + static const UINT BLOCK_SIZE = 16; + + int i, j, alpha, color_index, block_x, block_y, x, y; + const BYTE *block, *color_indices, *alpha_table; + WORD color[4]; + + block_x = 0; + block_y = 0; + + for (i = 0; i < block_count; i++) + { + block = blocks + i * BLOCK_SIZE; + + color[0] = *((WORD *)(block + 8)); + color[1] = *((WORD *)(block + 10)); + color[2] = MAKE_RGB565(((GET_RGB565_R(color[0]) * 2 + GET_RGB565_R(color[1]) + 1) / 3), + ((GET_RGB565_G(color[0]) * 2 + GET_RGB565_G(color[1]) + 1) / 3), + ((GET_RGB565_B(color[0]) * 2 + GET_RGB565_B(color[1]) + 1) / 3)); + color[3] = MAKE_RGB565(((GET_RGB565_R(color[0]) + GET_RGB565_R(color[1]) * 2 + 1) / 3), + ((GET_RGB565_G(color[0]) + GET_RGB565_G(color[1]) * 2 + 1) / 3), + ((GET_RGB565_B(color[0]) + GET_RGB565_B(color[1]) * 2 + 1) / 3)); + + alpha_table = block; + color_indices = block + 12; + for (j = 0; j < 16; j++) + { + x = block_x + j % 4; + y = block_y + j / 4; + if (x >= width || y >= height) continue; + alpha = (alpha_table[j / 2] >> (j % 2) * 4) & 0xF; + color_index = (color_indices[j / 4] >> ((j % 4) * 2)) & 0x3; + buffer[x + y * width] = rgb565_to_argb(color[color_index], (BYTE)((alpha * 0xFF + 0x7)/ 0xF)); + } + block_x += 4; + if (block_x >= width) { + block_x = 0; + block_y += 4; + } + } +} + static BOOL color_match(DWORD color_a, DWORD color_b) { static const int tolerance = 8; @@ -1036,8 +1079,19 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride, sizeof(buffer), NULL); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); - if (format_info.DxgiFormat == DXGI_FORMAT_BC1_UNORM) { - decode_bc1(test_data[i].data + block_offset, width_in_blocks * height_in_blocks, frame_width, frame_height, pixels); + if (format_info.DxgiFormat == DXGI_FORMAT_BC1_UNORM || + format_info.DxgiFormat == DXGI_FORMAT_BC2_UNORM ) { + switch (format_info.DxgiFormat) + { + case DXGI_FORMAT_BC1_UNORM: + decode_bc1(test_data[i].data + block_offset, width_in_blocks * height_in_blocks, frame_width, frame_height, pixels); + break; + case DXGI_FORMAT_BC2_UNORM: + decode_bc2(test_data[i].data + block_offset, width_in_blocks * height_in_blocks, frame_width, frame_height, pixels); + break; + default: + break; + } hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride, sizeof(buffer), buffer); ok(hr == S_OK, "Test %u, frame %u: CopyPixels failed, hr %#x\n", i, frame_index, hr); @@ -1047,7 +1101,6 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra "Test %u, frame %u: Pixels mismatch\n", i, frame_index); } - hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, frame_stride, sizeof(buffer), buffer); ok(hr == S_OK, "Test %u, frame %u: CopyPixels failed, hr %#x\n", i, frame_index, hr); if (hr == S_OK) {

1 0

Ziqing Hui : windowscodecs/tests: Add tests for decoding BC3 format.
by Alexandre Julliard 19 Aug '20

19 Aug '20

Module: wine Branch: master Commit: 8e599287780c2aef7ecae1e35f597e534d7f626e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e599287780c2aef7ecae1e3… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Aug 19 10:03:04 2020 +0800 windowscodecs/tests: Add tests for decoding BC3 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/tests/ddsformat.c | 67 +++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 8f283b3f0f..b28d4938ab 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -629,6 +629,67 @@ static void decode_bc2(const BYTE *blocks, UINT block_count, UINT width, UINT he } } +static void decode_bc3(const BYTE *block_data, UINT block_count, UINT width, UINT height, DWORD *buffer) +{ + static const UINT BLOCK_SIZE = 16; + + int i, j, color_index, alpha_index, block_x, block_y, x, y; + const BYTE *block, *color_indices, *alpha_indices; + WORD color[4]; + BYTE alpha[8]; + + block_x = 0; + block_y = 0; + + for (i = 0; i < block_count; i++) + { + block = block_data + i * BLOCK_SIZE; + + color[0] = *((WORD *)(block + 8)); + color[1] = *((WORD *)(block + 10)); + color[2] = MAKE_RGB565(((GET_RGB565_R(color[0]) * 2 + GET_RGB565_R(color[1]) + 1) / 3), + ((GET_RGB565_G(color[0]) * 2 + GET_RGB565_G(color[1]) + 1) / 3), + ((GET_RGB565_B(color[0]) * 2 + GET_RGB565_B(color[1]) + 1) / 3)); + color[3] = MAKE_RGB565(((GET_RGB565_R(color[0]) + GET_RGB565_R(color[1]) * 2 + 1) / 3), + ((GET_RGB565_G(color[0]) + GET_RGB565_G(color[1]) * 2 + 1) / 3), + ((GET_RGB565_B(color[0]) + GET_RGB565_B(color[1]) * 2 + 1) / 3)); + + alpha[0] = *block; + alpha[1] = *(block + 1); + if (alpha[0] > alpha[1]) { + for (j = 2; j < 8; j++) + { + alpha[j] = (BYTE)((alpha[0] * (8 - j) + alpha[1] * (j - 1) + 3) / 7); + } + } else { + for (j = 2; j < 6; j++) + { + alpha[j] = (BYTE)((alpha[0] * (6 - j) + alpha[1] * (j - 1) + 2) / 5); + } + alpha[6] = 0; + alpha[7] = 0xFF; + } + + alpha_indices = block + 2; + color_indices = block + 12; + for (j = 0; j < 16; j++) + { + x = block_x + j % 4; + y = block_y + j / 4; + if (x >= width || y >= height) continue; + alpha_index = (*((DWORD *)(alpha_indices + (j / 8) * 3)) >> ((j % 8) * 3)) & 0x7; + color_index = (color_indices[j / 4] >> ((j % 4) * 2)) & 0x3; + buffer[x + y * width] = rgb565_to_argb(color[color_index], alpha[alpha_index]); + } + + block_x += 4; + if (block_x >= width) { + block_x = 0; + block_y += 4; + } + } +} + static BOOL color_match(DWORD color_a, DWORD color_b) { static const int tolerance = 8; @@ -1080,7 +1141,8 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); if (format_info.DxgiFormat == DXGI_FORMAT_BC1_UNORM || - format_info.DxgiFormat == DXGI_FORMAT_BC2_UNORM ) { + format_info.DxgiFormat == DXGI_FORMAT_BC2_UNORM || + format_info.DxgiFormat == DXGI_FORMAT_BC3_UNORM ) { switch (format_info.DxgiFormat) { case DXGI_FORMAT_BC1_UNORM: @@ -1089,6 +1151,9 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra case DXGI_FORMAT_BC2_UNORM: decode_bc2(test_data[i].data + block_offset, width_in_blocks * height_in_blocks, frame_width, frame_height, pixels); break; + case DXGI_FORMAT_BC3_UNORM: + decode_bc3(test_data[i].data + block_offset, width_in_blocks * height_in_blocks, frame_width, frame_height, pixels); + break; default: break; }

1 0

Ziqing Hui : windowscodecs/tests: Merge decode_bc*() into a single function.
by Alexandre Julliard 19 Aug '20

19 Aug '20

Module: wine Branch: master Commit: b447bd97e55e2e6a88f872c4fb7a37f5e251a0e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b447bd97e55e2e6a88f872c4… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Aug 19 10:03:37 2020 +0800 windowscodecs/tests: Merge decode_bc*() into a single function. 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 | 208 ++++++++++++++--------------------- 1 file changed, 80 insertions(+), 128 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b447bd97e55e2e6a88f8…

1 0

Ziqing Hui : windowscodecs/tests: Add macro BLOCK_WIDTH and BLOCK_HEIGHT.
by Alexandre Julliard 19 Aug '20

19 Aug '20

Module: wine Branch: master Commit: c525dae7abce37ac9968d5720fd985e33ef7dc83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c525dae7abce37ac9968d572… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Aug 19 10:04:05 2020 +0800 windowscodecs/tests: Add macro BLOCK_WIDTH and BLOCK_HEIGHT. 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 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 18ce0a241a..790c28315a 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -30,6 +30,9 @@ #define MAKE_RGB565(r, g, b) ((WORD)(((BYTE)(r) << 11) | ((BYTE)(g) << 5) | (BYTE)(b))) #define MAKE_ARGB(a, r, g, b) (((DWORD)(a) << 24) | ((DWORD)(r) << 16) | ((DWORD)(g) << 8) | (DWORD)(b)) +#define BLOCK_WIDTH 4 +#define BLOCK_HEIGHT 4 + /* 1x1 uncompressed(Alpha) DDS image */ static BYTE test_dds_alpha[] = { 'D', 'D', 'S', ' ', 0x7C, 0x00, 0x00, 0x00, 0x07, 0x10, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, @@ -645,10 +648,10 @@ static void decode_block(const BYTE *block_data, UINT block_count, DXGI_FORMAT f buffer[x + y * width] = rgb565_to_argb(color_value, alpha_value); } - block_x += 4; + block_x += BLOCK_WIDTH; if (block_x >= width) { block_x = 0; - block_y += 4; + block_y += BLOCK_HEIGHT; } } } @@ -883,8 +886,8 @@ static void test_dds_decoder_frame_properties(IWICBitmapFrameDecode *frame_decod expected_block_width = 1; expected_block_height = 1; } else { - expected_block_width = 4; - expected_block_height = 4; + expected_block_width = BLOCK_WIDTH; + expected_block_height = BLOCK_HEIGHT; } hr = IWICDdsFrameDecode_GetFormatInfo(dds_frame, NULL);

1 0