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

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

Aug. 19, 2020

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

Damjan Jovanovic : riched20: Implement ITextRange::MoveStart() and ITextRange::MoveEnd() for tomCharacter.
by Alexandre Julliard Aug. 19, 2020

Aug. 19, 2020

Module: wine Branch: master Commit: 41915acaed6c6dffb0333ca8f16991ec3c56a09d URL: https://source.winehq.org/git/wine.git/?a=commit;h=41915acaed6c6dffb0333ca8… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Aug 19 05:19:39 2020 +0200 riched20: Implement ITextRange::MoveStart() and ITextRange::MoveEnd() for tomCharacter. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/richole.c | 77 ++++++++++++++++++++++++++++++---- dlls/riched20/tests/richole.c | 98 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 166 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 7c281ab364..c30db2841c 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2191,20 +2191,63 @@ static HRESULT WINAPI ITextRange_fnMove(ITextRange *me, LONG unit, LONG count, L return E_NOTIMPL; } +static HRESULT textrange_movestart(ITextRange *range, ME_TextEditor *editor, LONG unit, LONG count, LONG *delta) +{ + LONG old_start, old_end, new_start, new_end; + HRESULT hr = S_OK; + + if (!count) + { + if (delta) + *delta = 0; + return S_FALSE; + } + + ITextRange_GetStart(range, &old_start); + ITextRange_GetEnd(range, &old_end); + switch (unit) + { + case tomCharacter: + { + ME_Cursor cursor; + LONG moved; + + ME_CursorFromCharOfs(editor, old_start, &cursor); + moved = ME_MoveCursorChars(editor, &cursor, count, FALSE); + new_start = old_start + moved; + new_end = old_end; + if (new_end < new_start) + new_end = new_start; + if (delta) + *delta = moved; + break; + } + default: + FIXME("unit %d is not supported\n", unit); + return E_NOTIMPL; + } + if (new_start == old_start) + hr = S_FALSE; + ITextRange_SetStart(range, new_start); + ITextRange_SetEnd(range, new_end); + + return hr; +} + static HRESULT WINAPI ITextRange_fnMoveStart(ITextRange *me, LONG unit, LONG count, LONG *delta) { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%d %d %p): stub\n", This, unit, count, delta); + TRACE("(%p)->(%d %d %p)\n", This, unit, count, delta); if (!This->child.reole) return CO_E_RELEASED; - return E_NOTIMPL; + return textrange_movestart(me, This->child.reole->editor, unit, count, delta); } -static HRESULT textrange_moveend(ITextRange *range, LONG unit, LONG count, LONG *delta) +static HRESULT textrange_moveend(ITextRange *range, ME_TextEditor *editor, LONG unit, LONG count, LONG *delta) { LONG old_start, old_end, new_start, new_end; HRESULT hr = S_OK; @@ -2220,6 +2263,21 @@ static HRESULT textrange_moveend(ITextRange *range, LONG unit, LONG count, LONG ITextRange_GetEnd(range, &old_end); switch (unit) { + case tomCharacter: + { + ME_Cursor cursor; + LONG moved; + + ME_CursorFromCharOfs(editor, old_end, &cursor); + moved = ME_MoveCursorChars(editor, &cursor, count, TRUE); + new_start = old_start; + new_end = old_end + moved; + if (new_end < new_start) + new_start = new_end; + if (delta) + *delta = moved; + break; + } case tomStory: if (count < 0) new_start = new_end = 0; @@ -2260,7 +2318,7 @@ static HRESULT WINAPI ITextRange_fnMoveEnd(ITextRange *me, LONG unit, LONG count if (!This->child.reole) return CO_E_RELEASED; - return textrange_moveend(me, unit, count, delta); + return textrange_moveend(me, This->child.reole->editor, unit, count, delta); } static HRESULT WINAPI ITextRange_fnMoveWhile(ITextRange *me, VARIANT *charset, LONG count, @@ -4982,13 +5040,18 @@ static HRESULT WINAPI ITextSelection_fnMoveStart(ITextSelection *me, LONG unit, LONG *delta) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + ITextRange *range = NULL; + HRESULT hr; - FIXME("(%p)->(%d %d %p): stub\n", This, unit, count, delta); + TRACE("(%p)->(%d %d %p)\n", This, unit, count, delta); if (!This->reOle) return CO_E_RELEASED; - return E_NOTIMPL; + ITextSelection_QueryInterface(me, &IID_ITextRange, (void**)&range); + hr = textrange_movestart(range, This->reOle->editor, unit, count, delta); + ITextRange_Release(range); + return hr; } static HRESULT WINAPI ITextSelection_fnMoveEnd(ITextSelection *me, LONG unit, LONG count, @@ -5004,7 +5067,7 @@ static HRESULT WINAPI ITextSelection_fnMoveEnd(ITextSelection *me, LONG unit, LO return CO_E_RELEASED; ITextSelection_QueryInterface(me, &IID_ITextRange, (void**)&range); - hr = textrange_moveend(range, unit, count, delta); + hr = textrange_moveend(range, This->reOle->editor, unit, count, delta); ITextRange_Release(range); return hr; } diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 70646202f0..5f903aa1ac 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3694,7 +3694,7 @@ static void test_Expand(void) ITextRange_Release(range); } -static void test_MoveEnd(void) +static void test_MoveEnd_story(void) { static const char test_text1[] = "Word1 Word2"; IRichEditOle *reole = NULL; @@ -3808,6 +3808,99 @@ static void test_MoveEnd(void) ITextRange_Release(range); } +static void test_character_movestart(ITextRange *range, int textlen, int i, int j, LONG target) +{ + HRESULT hr; + LONG delta = 0; + LONG expected_delta; + LONG expected_start = target; + + if (expected_start < 0) + expected_start = 0; + else if (expected_start > textlen) + expected_start = textlen; + expected_delta = expected_start - i; + hr = ITextRange_SetRange(range, i, j); + ok(SUCCEEDED(hr), "got 0x%08x\n", hr); + hr = ITextRange_MoveStart(range, tomCharacter, target - i, &delta); + if (expected_start == i) { + ok(hr == S_FALSE, "(%d,%d) move by %d got hr=0x%08x\n", i, j, target - i, hr); + ok(delta == 0, "(%d,%d) move by %d got delta %d\n", i, j, target - i, delta); + CHECK_RANGE(range, i, j); + } else { + ok(hr == S_OK, "(%d,%d) move by %d got hr=0x%08x\n", i, j, target - i, hr); + ok(delta == expected_delta, "(%d,%d) move by %d got delta %d\n", i, j, target - i, delta); + if (expected_start <= j) + CHECK_RANGE(range, expected_start, j); + else + CHECK_RANGE(range, expected_start, expected_start); + } +} + +static void test_character_moveend(ITextRange *range, int textlen, int i, int j, LONG target) +{ + HRESULT hr; + LONG delta; + LONG expected_delta; + LONG expected_end = target; + + if (expected_end < 0) + expected_end = 0; + else if (expected_end > textlen + 1) + expected_end = textlen + 1; + expected_delta = expected_end - j; + hr = ITextRange_SetRange(range, i, j); + ok(SUCCEEDED(hr), "got 0x%08x\n", hr); + hr = ITextRange_MoveEnd(range, tomCharacter, target - j, &delta); + if (expected_end == j) { + ok(hr == S_FALSE, "(%d,%d) move by %d got hr=0x%08x\n", i, j, target - j, hr); + ok(delta == 0, "(%d,%d) move by %d got delta %d\n", i, j, target - j, delta); + CHECK_RANGE(range, i, j); + } else { + ok(hr == S_OK, "(%d,%d) move by %d got hr=0x%08x\n", i, j, target - j, hr); + ok(delta == expected_delta, "(%d,%d) move by %d got delta %d\n", i, j, target - j, delta); + if (i <= expected_end) + CHECK_RANGE(range, i, expected_end); + else + CHECK_RANGE(range, expected_end, expected_end); + } +} + +static void test_character_movement(void) +{ + static const char test_text1[] = "ab\n c"; + IRichEditOle *reole = NULL; + ITextDocument *doc = NULL; + ITextRange *range; + ITextSelection *selection; + HRESULT hr; + HWND hwnd; + int i, j; + const int textlen = strlen(test_text1); + + create_interfaces(&hwnd, &reole, &doc, &selection); + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); + + hr = ITextDocument_Range(doc, 0, 0, &range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* Exhaustive test of every possible combination of (start,end) locations, + * against every possible target location to move to. */ + for (i = 0; i <= textlen; i++) { + for (j = i; j <= textlen; j++) { + LONG target; + for (target = -2; target <= textlen + 3; target++) { + test_character_moveend(range, textlen, i, j, target); + test_character_movestart(range, textlen, i, j, target); + } + } + } + + release_interfaces(&hwnd, &reole, &doc, NULL); + ITextSelection_Release(selection); + ITextRange_Release(range); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -3846,5 +3939,6 @@ START_TEST(richole) test_GetStoryLength(); test_ITextSelection_GetDuplicate(); test_Expand(); - test_MoveEnd(); + test_MoveEnd_story(); + test_character_movement(); }

1 0

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

Aug. 19, 2020

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 tests for decoding BC3 format.
by Alexandre Julliard Aug. 19, 2020

Aug. 19, 2020

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: Add tests for decoding BC2 format.
by Alexandre Julliard Aug. 19, 2020

Aug. 19, 2020

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: Fix a variable name typo in decode_bc1().
by Alexandre Julliard Aug. 19, 2020

Aug. 19, 2020

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

Julian Rüger : German translation for release 5.0.1.
by Alexandre Julliard Aug. 19, 2020

Aug. 19, 2020

Module: website Branch: master Commit: 8aca7d18e519e5929994e0b2b57e2a82070b3b8c URL: https://source.winehq.org/git/website.git/?a=commit;h=8aca7d18e519e5929994e… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Aug 19 15:21:46 2020 +0200 German translation for release 5.0.1. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020060201.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/de/2020060201.xml b/news/de/2020060201.xml new file mode 100644 index 00000000..beaa798c --- /dev/null +++ b/news/de/2020060201.xml @@ -0,0 +1,14 @@ +<news> +<date>2. Juni 2020</date> +<title>Wine 5.0.1 freigegeben</title> +<body> + Die Wartungsversion 5.0.1 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.0.1">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Kompilierung mit GCC 10 wird nun unterstützt</li> + <li>Einige Zeitzonen hinzugefügt</li> + <li>Diverse Fehlerkorrekturen</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.0/wine-5.0.1.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 5.10.
by Alexandre Julliard Aug. 19, 2020

Aug. 19, 2020

Module: website Branch: master Commit: 27d92cc3aba99727113a06c87567032d3a7f676d URL: https://source.winehq.org/git/website.git/?a=commit;h=27d92cc3aba99727113a0… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Aug 19 15:24:30 2020 +0200 German translation for release 5.10. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020060501.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/de/2020060501.xml b/news/de/2020060501.xml new file mode 100644 index 00000000..e9863f35 --- /dev/null +++ b/news/de/2020060501.xml @@ -0,0 +1,18 @@ +<news> +<date>5. Juni 2020</date> +<title>Wine 5.10 freigegeben</title> +<body> + Die Entwicklungsversion 5.10 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.10">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Weitere Fortschritte des WineD3D-Vulkan-Backend.</li> + <li>Anfänge einer separaten Unix-Bibliothek für NTDLL.</li> + <li>Bessere Unterstützung von Anti-Cheat-Kerneltreibern.</li> + <li>Weitere Glyphen-Ersetzungen in DirectWrite.</li> + <li>Unterstützung von privaten DSS-Schlüsseln.</li> + <li>Korrekturen der ARM64-Ausnahmebehandlung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.10.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 5.9.
by Alexandre Julliard Aug. 19, 2020

Aug. 19, 2020

Module: website Branch: master Commit: a4c4e57878d0a92e2c03e4f787a2286448976085 URL: https://source.winehq.org/git/website.git/?a=commit;h=a4c4e57878d0a92e2c03e… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Aug 19 15:19:32 2020 +0200 German translation for release 5.9. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020052201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2020052201.xml b/news/de/2020052201.xml new file mode 100644 index 00000000..db2483d5 --- /dev/null +++ b/news/de/2020052201.xml @@ -0,0 +1,16 @@ +<news> +<date>22. Mai 2020</date> +<title>Wine 5.9 freigegeben</title> +<body> + Die Entwicklungsversion 5.9 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.9">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Größere Fortschritte des WineD3D-Vulkan-Backend.</li> + <li>Anfängliche Unterstützung, DLLs in einen PE- und einen Unix-Part aufzuteilen.</li> + <li>Unterstützung für die Erzeugung von PDB-Dateien beim Bauen von PE-DLLs.</li> + <li>Zeitstempel-Updates im User-Shared-Data-Bereich des Kernels.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.9.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 5.11.
by Alexandre Julliard Aug. 19, 2020

Aug. 19, 2020

Module: website Branch: master Commit: 4d1127dc9ccfd51b469e67f39c59699a71ec5314 URL: https://source.winehq.org/git/website.git/?a=commit;h=4d1127dc9ccfd51b469e6… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Aug 19 15:27:48 2020 +0200 German translation for release 5.11. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020061901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2020061901.xml b/news/de/2020061901.xml new file mode 100644 index 00000000..188c7b29 --- /dev/null +++ b/news/de/2020061901.xml @@ -0,0 +1,17 @@ +<news> +<date>19. Juni 2020</date> +<title>Wine 5.11 freigegeben</title> +<body> + Die Entwicklungsversion 5.11 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.11">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Wine-Mono aktualisiert auf 5.1.0, mit WpfGfx-Unterstützung.</li> + <li>Weitere Arbeit an der separaten Unix-Bibliothek für NTDLL.</li> + <li>Anfänge der Implementierung eines NetIO-Kerneltreibers.</li> + <li>Anfängliche Unterstützung der Print-Ticket-API.</li> + <li>Entfernung der obsoleten 32-Bit PowerPC-Architektur.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.11.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0