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

Ziqing Hui : windowscodecs/tests: Add pixel format bpp to test_data.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 80ae60ca26ca7fb4d9e24a1dbc6f9b882c4b783e URL: https://source.winehq.org/git/wine.git/?a=commit;h=80ae60ca26ca7fb4d9e24a1d… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Aug 25 22:01:22 2020 +0800 windowscodecs/tests: Add pixel format bpp to test_data. 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 | 73 ++++++++++++++---------------------- 1 file changed, 28 insertions(+), 45 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 9e8c015a58..11d661ba7d 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -390,51 +390,52 @@ static struct test_data { HRESULT init_hr; UINT expected_frame_count; UINT expected_bytes_per_block; + UINT pixel_format_bpp; const GUID *expected_pixel_format; WICDdsParameters expected_parameters; BOOL wine_init; } test_data[] = { - { test_dds_alpha, sizeof(test_dds_alpha), WINCODEC_ERR_BADHEADER, 1, 1, &GUID_WICPixelFormat8bppAlpha, + { test_dds_alpha, sizeof(test_dds_alpha), WINCODEC_ERR_BADHEADER, 1, 1, 8, &GUID_WICPixelFormat8bppAlpha, { 1, 1, 1, 1, 1, DXGI_FORMAT_A8_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, - { test_dds_luminance, sizeof(test_dds_luminance), WINCODEC_ERR_BADHEADER, 1, 1, &GUID_WICPixelFormat8bppGray, + { test_dds_luminance, sizeof(test_dds_luminance), WINCODEC_ERR_BADHEADER, 1, 1, 8, &GUID_WICPixelFormat8bppGray, { 1, 1, 1, 1, 1, DXGI_FORMAT_R8_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, - { test_dds_rgb565, sizeof(test_dds_rgb565), WINCODEC_ERR_BADHEADER, 1, 2, &GUID_WICPixelFormat16bppBGR565, + { test_dds_rgb565, sizeof(test_dds_rgb565), WINCODEC_ERR_BADHEADER, 1, 2, 16, &GUID_WICPixelFormat16bppBGR565, { 4, 4, 1, 1, 1, DXGI_FORMAT_B5G6R5_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, - { test_dds_24bpp, sizeof(test_dds_24bpp), WINCODEC_ERR_BADHEADER, 1, 3, &GUID_WICPixelFormat24bppBGR, + { test_dds_24bpp, sizeof(test_dds_24bpp), WINCODEC_ERR_BADHEADER, 1, 3, 24, &GUID_WICPixelFormat24bppBGR, { 1, 1, 1, 1, 1, DXGI_FORMAT_UNKNOWN, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, - { test_dds_32bpp_xrgb, sizeof(test_dds_32bpp_xrgb), WINCODEC_ERR_BADHEADER, 1, 4, &GUID_WICPixelFormat32bppBGR, + { test_dds_32bpp_xrgb, sizeof(test_dds_32bpp_xrgb), WINCODEC_ERR_BADHEADER, 1, 4, 32, &GUID_WICPixelFormat32bppBGR, { 1, 1, 1, 1, 1, DXGI_FORMAT_B8G8R8X8_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, - { test_dds_32bpp_argb, sizeof(test_dds_32bpp_argb), WINCODEC_ERR_BADHEADER, 1, 4, &GUID_WICPixelFormat32bppBGRA, + { test_dds_32bpp_argb, sizeof(test_dds_32bpp_argb), WINCODEC_ERR_BADHEADER, 1, 4, 32, &GUID_WICPixelFormat32bppBGRA, { 1, 1, 1, 1, 1, DXGI_FORMAT_B8G8R8A8_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, - { test_dds_64bpp, sizeof(test_dds_64bpp), WINCODEC_ERR_BADHEADER, 1, 8, &GUID_WICPixelFormat64bppBGRA, + { test_dds_64bpp, sizeof(test_dds_64bpp), WINCODEC_ERR_BADHEADER, 1, 8, 64, &GUID_WICPixelFormat64bppBGRA, { 1, 1, 1, 1, 1, DXGI_FORMAT_R16G16B16A16_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, - { test_dds_96bpp, sizeof(test_dds_96bpp), WINCODEC_ERR_BADHEADER, 1, 12, &GUID_WICPixelFormat96bppRGBFloat, + { test_dds_96bpp, sizeof(test_dds_96bpp), WINCODEC_ERR_BADHEADER, 1, 12, 96, &GUID_WICPixelFormat96bppRGBFloat, { 1, 1, 1, 1, 1, DXGI_FORMAT_R32G32B32_FLOAT, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, - { test_dds_128bpp, sizeof(test_dds_128bpp), WINCODEC_ERR_BADHEADER, 1, 16, &GUID_WICPixelFormat128bppRGBAFloat, + { test_dds_128bpp, sizeof(test_dds_128bpp), WINCODEC_ERR_BADHEADER, 1, 16, 128, &GUID_WICPixelFormat128bppRGBAFloat, { 1, 1, 1, 1, 1, DXGI_FORMAT_R32G32B32A32_FLOAT, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, - { test_dds_cube, sizeof(test_dds_cube), WINCODEC_ERR_BADHEADER, 18, 8, &GUID_WICPixelFormat32bppPBGRA, + { test_dds_cube, sizeof(test_dds_cube), WINCODEC_ERR_BADHEADER, 18, 8, 32, &GUID_WICPixelFormat32bppPBGRA, { 4, 4, 1, 3, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTextureCube, WICDdsAlphaModePremultiplied }, TRUE }, - { test_dds_cube_dx10, sizeof(test_dds_cube_dx10), WINCODEC_ERR_BADHEADER, 18, 8, &GUID_WICPixelFormat32bppBGRA, + { test_dds_cube_dx10, sizeof(test_dds_cube_dx10), WINCODEC_ERR_BADHEADER, 18, 8, 32, &GUID_WICPixelFormat32bppBGRA, { 4, 4, 1, 3, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTextureCube, WICDdsAlphaModeUnknown }, TRUE }, - { test_dds_mipmaps, sizeof(test_dds_mipmaps), S_OK, 3, 8, &GUID_WICPixelFormat32bppPBGRA, + { test_dds_mipmaps, sizeof(test_dds_mipmaps), S_OK, 3, 8, 32, &GUID_WICPixelFormat32bppPBGRA, { 4, 4, 1, 3, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTexture2D, WICDdsAlphaModePremultiplied } }, - { test_dds_volume, sizeof(test_dds_volume), S_OK, 7, 8, &GUID_WICPixelFormat32bppPBGRA, + { test_dds_volume, sizeof(test_dds_volume), S_OK, 7, 8, 32, &GUID_WICPixelFormat32bppPBGRA, { 4, 4, 4, 3, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTexture3D, WICDdsAlphaModePremultiplied } }, - { test_dds_array, sizeof(test_dds_array), S_OK, 9, 8, &GUID_WICPixelFormat32bppBGRA, + { test_dds_array, sizeof(test_dds_array), S_OK, 9, 8, 32, &GUID_WICPixelFormat32bppBGRA, { 4, 4, 1, 3, 3, DXGI_FORMAT_BC1_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown } }, - { test_dds_dxt1c, sizeof(test_dds_dxt1c), S_OK, 1, 8, &GUID_WICPixelFormat32bppPBGRA, + { test_dds_dxt1c, sizeof(test_dds_dxt1c), S_OK, 1, 8, 32, &GUID_WICPixelFormat32bppPBGRA, { 4, 4, 1, 1, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTexture2D, WICDdsAlphaModePremultiplied } }, - { test_dds_dxt1a, sizeof(test_dds_dxt1a), S_OK, 1, 8, &GUID_WICPixelFormat32bppPBGRA, + { test_dds_dxt1a, sizeof(test_dds_dxt1a), S_OK, 1, 8, 32, &GUID_WICPixelFormat32bppPBGRA, { 4, 4, 1, 1, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTexture2D, WICDdsAlphaModePremultiplied } }, - { test_dds_dxt2, sizeof(test_dds_dxt2), S_OK, 3, 16, &GUID_WICPixelFormat32bppPBGRA, + { test_dds_dxt2, sizeof(test_dds_dxt2), S_OK, 3, 16, 32, &GUID_WICPixelFormat32bppPBGRA, { 4, 4, 1, 3, 1, DXGI_FORMAT_BC2_UNORM, WICDdsTexture2D, WICDdsAlphaModePremultiplied } }, - { test_dds_dxt3, sizeof(test_dds_dxt3), S_OK, 2, 16, &GUID_WICPixelFormat32bppBGRA, + { test_dds_dxt3, sizeof(test_dds_dxt3), S_OK, 2, 16, 32, &GUID_WICPixelFormat32bppBGRA, { 1, 3, 1, 2, 1, DXGI_FORMAT_BC2_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown } }, - { test_dds_dxt4, sizeof(test_dds_dxt4), S_OK, 3, 16, &GUID_WICPixelFormat32bppPBGRA, + { test_dds_dxt4, sizeof(test_dds_dxt4), S_OK, 3, 16, 32, &GUID_WICPixelFormat32bppPBGRA, { 4, 4, 1, 3, 1, DXGI_FORMAT_BC3_UNORM, WICDdsTexture2D, WICDdsAlphaModePremultiplied } }, - { test_dds_dxt5, sizeof(test_dds_dxt5), S_OK, 3, 16, &GUID_WICPixelFormat32bppBGRA, + { test_dds_dxt5, sizeof(test_dds_dxt5), S_OK, 3, 16, 32, &GUID_WICPixelFormat32bppBGRA, { 6, 6, 1, 3, 1, DXGI_FORMAT_BC3_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown } }, - { test_dds_12x12, sizeof(test_dds_12x12), S_OK, 8, 16, &GUID_WICPixelFormat32bppBGRA, + { test_dds_12x12, sizeof(test_dds_12x12), S_OK, 8, 16, 32, &GUID_WICPixelFormat32bppBGRA, { 12, 12, 1, 4, 2, DXGI_FORMAT_BC2_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown } }, { test_dds_bad_magic, sizeof(test_dds_bad_magic), WINCODEC_ERR_UNKNOWNIMAGEFORMAT }, { test_dds_bad_header, sizeof(test_dds_bad_header), WINCODEC_ERR_BADHEADER }, @@ -535,29 +536,6 @@ static BOOL has_extended_header(const BYTE *data) return data[84] == 'D' && data[85] == 'X' && data[86] == '1' && data[87] == '0'; } -static UINT get_pixel_format_bpp(GUID *pixel_format) -{ - HRESULT hr; - UINT bpp = 0; - IWICComponentInfo *info = NULL; - IWICPixelFormatInfo* format_info = NULL; - - hr = IWICImagingFactory_CreateComponentInfo(factory, pixel_format, &info); - ok(hr == S_OK, "CreateComponentInfo failed, hr %#x\n", hr); - if (hr != S_OK) goto end; - hr = IWICComponentInfo_QueryInterface(info, &IID_IWICPixelFormatInfo, (void **)&format_info); - ok(hr == S_OK, "QueryInterface failed, hr %#x\n", hr); - if (hr != S_OK) goto end; - hr = IWICPixelFormatInfo_GetBitsPerPixel(format_info, &bpp); - ok(hr == S_OK, "GetBitsPerPixel failed, hr %#x\n", hr); - -end: - if (format_info) IWICPixelFormatInfo_Release(format_info); - if (info) IWICComponentInfo_Release(info); - - return bpp; -} - static DWORD rgb565_to_argb(WORD color, BYTE alpha) { return MAKE_ARGB(alpha, (GET_RGB565_R(color) * 0xFF + 0x0F) / 0x1F, @@ -1074,7 +1052,12 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra /* CopyPixels tests */ - bpp = get_pixel_format_bpp(&pixel_format); + if (!is_compressed(format_info.DxgiFormat)) { + skip("Skip CopyPixels tests for uncompressed image\n"); + return; + } + + bpp = test_data[i].pixel_format_bpp; stride = rect.Width * bpp / 8; frame_stride = frame_width * bpp / 8; frame_size = frame_stride * frame_height;

1 0

Ziqing Hui : windowscodecs: Remove get_pixel_format_bpp().
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: f39fd206b5646cfd7ececdc12e5d3428745511be URL: https://source.winehq.org/git/wine.git/?a=commit;h=f39fd206b5646cfd7ececdc1… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Aug 25 22:01:47 2020 +0800 windowscodecs: Remove get_pixel_format_bpp(). 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 | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index d16fc9700d..72c884b0ed 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -125,6 +125,7 @@ typedef struct dds_info { WICDdsDimension dimension; WICDdsAlphaMode alpha_mode; const GUID *pixel_format; + UINT pixel_format_bpp; } dds_info; typedef struct dds_frame_info { @@ -470,11 +471,18 @@ static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *h info->dimension = get_dimension(NULL, header_dxt10); info->alpha_mode = header_dxt10->miscFlags2 & 0x00000008; info->data_offset = sizeof(DWORD) + sizeof(*header) + sizeof(*header_dxt10); + if (is_compressed(info->format)) { + info->pixel_format_bpp = 32; + } else { + info->pixel_format_bpp = 0; + FIXME("Pixel format bpp is incorrect for uncompressed DDS image with extended header\n"); + } } else { info->format = format_info->dxgi_format; info->dimension = get_dimension(header, NULL); info->alpha_mode = get_alpha_mode_from_fourcc(header->ddspf.fourCC); info->data_offset = sizeof(DWORD) + sizeof(*header); + info->pixel_format_bpp = format_info->wic_format_bpp; } info->pixel_format = (info->alpha_mode == WICDdsAlphaModePremultiplied) ? &GUID_WICPixelFormat32bppPBGRA : &GUID_WICPixelFormat32bppBGRA; @@ -502,27 +510,6 @@ static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *h if (info->dimension == WICDdsTextureCube) info->frame_count *= 6; } -static UINT get_pixel_format_bpp(const GUID *pixel_format) -{ - HRESULT hr; - UINT bpp = 0; - IWICComponentInfo *info = NULL; - IWICPixelFormatInfo* format_info = NULL; - - hr = CreateComponentInfo(pixel_format, &info); - if (hr != S_OK) goto end; - hr = IWICComponentInfo_QueryInterface(info, &IID_IWICPixelFormatInfo, (void **)&format_info); - if (hr != S_OK) goto end; - - IWICPixelFormatInfo_GetBitsPerPixel(format_info, &bpp); - -end: - if (format_info) IWICPixelFormatInfo_Release(format_info); - if (info) IWICComponentInfo_Release(info); - - return bpp; -} - static void decode_block(const BYTE *block_data, UINT block_count, DXGI_FORMAT format, UINT width, UINT height, DWORD *buffer) { @@ -766,6 +753,8 @@ static HRESULT WINAPI DdsFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, if (!pbBuffer) return E_INVALIDARG; bpp = This->info.pixel_format_bpp; + if (!bpp) return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + frame_stride = This->info.width * bpp / 8; frame_size = frame_stride * This->info.height; if (!prc) { @@ -1326,7 +1315,7 @@ static HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *iface, frame_decode->info.width_in_blocks = frame_width_in_blocks; frame_decode->info.height_in_blocks = frame_height_in_blocks; frame_decode->info.pixel_format = This->info.pixel_format; - frame_decode->info.pixel_format_bpp = get_pixel_format_bpp(This->info.pixel_format); + frame_decode->info.pixel_format_bpp = This->info.pixel_format_bpp; frame_decode->block_data = HeapAlloc(GetProcessHeap(), 0, frame_size); frame_decode->pixel_data = NULL; hr = IStream_Seek(This->stream, seek, SEEK_SET, NULL);

1 0

Ziqing Hui : windowscodecs/tests: Add CopyPixels data tests for uncompressed images.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 64c7d59ee98f5c613ba96f19e1974cb71906d932 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64c7d59ee98f5c613ba96f19… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Aug 25 22:01:56 2020 +0800 windowscodecs/tests: Add CopyPixels data tests for uncompressed images. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 11d661ba7d..1a7ef95ada 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -943,8 +943,7 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra WICDdsFormatInfo format_info; WICRect rect = { 0, 0, 1, 1 }, rect_test_a = { 0, 0, 0, 0 }, rect_test_b = { 0, 0, 0xdeadbeaf, 0xdeadbeaf }; WICRect rect_test_c = { -0xdeadbeaf, -0xdeadbeaf, 1, 1 }, rect_test_d = { 0xdeadbeaf, 0xdeadbeaf, 1, 1 }; - BYTE buffer[2048]; - DWORD pixels[2048]; + BYTE buffer[2048], pixels[2048]; UINT stride, frame_stride, frame_size, frame_width, frame_height, width_in_blocks, height_in_blocks, bpp; UINT width, height, depth, array_index; UINT block_offset; @@ -1106,23 +1105,34 @@ 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 (is_compressed(format_info.DxgiFormat)) { - decode_block(test_data[i].data + block_offset, width_in_blocks * height_in_blocks, - format_info.DxgiFormat, frame_width, frame_height, pixels); + format_info.DxgiFormat, frame_width, frame_height, (DWORD *)pixels); + } else { + memcpy(pixels, test_data[i].data + block_offset, frame_size); + } - 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); - if (hr == S_OK) { + 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); + if (hr == S_OK) { + if (is_compressed(format_info.DxgiFormat)) { ok(color_buffer_match((DWORD *)pixels, (DWORD *)buffer, 1), "Test %u, frame %u: Pixels mismatch\n", i, frame_index); + } else { + ok(!strncmp((const char *)pixels, (const char *)buffer, bpp / 8), + "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) { + 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) { + if (is_compressed(format_info.DxgiFormat)) { ok(color_buffer_match((DWORD *)pixels, (DWORD *)buffer, frame_size / (bpp / 8)), - "Test %u, frame %u: Pixels mismatch\n", i, frame_index); - } + "Test %u, frame %u: Pixels mismatch\n", i, frame_index); + } else { + ok(!strncmp((const char *)pixels, (const char *)buffer, frame_size), + "Test %u, frame %u: Pixels mismatch\n", i, frame_index); + }; } }

1 0

Martin Storsjo : ntdll: Fix arm64 jump buffer float restoration.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 99a6ae5b863b220e72f01abc9ce3ab1c7be9d7f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99a6ae5b863b220e72f01abc… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Aug 25 19:53:58 2020 +0300 ntdll: Fix arm64 jump buffer float restoration. Fix a typo in copying fields from the jump buffer to the context, use the right type of long in the struct. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 719c71f952..d0f8c875b8 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -57,8 +57,8 @@ struct MSVCRT_JUMP_BUFFER unsigned __int64 Fp; unsigned __int64 Lr; unsigned __int64 Sp; - unsigned long Fpcr; - unsigned long Fpsr; + ULONG Fpcr; + ULONG Fpsr; double D[8]; }; @@ -1002,7 +1002,7 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) context->Fpsr = jmp->Fpsr; for (i = 0; i < 8; i++) - context->V[8+i].D[0] = jmp->D[0]; + context->V[8+i].D[0] = jmp->D[i]; } else if (rec && rec->ExceptionCode == STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters >= 1) {

1 0

Martin Storsjo : ntdll: Capture vector registers in arm64 RtlCaptureContext.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: a9639dd6053f1e7de915c29851cc1be45ed537d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9639dd6053f1e7de915c298… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Aug 25 20:01:30 2020 +0300 ntdll: Capture vector registers in arm64 RtlCaptureContext. Since 5b3842451ba6 we set the flag indicating that the context contained float registers, but we didn't actually populate them yet. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index d0f8c875b8..8d21c39f6c 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -96,6 +96,22 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 8, "stp x29, x30, [x0, #0xf0]\n\t" /* context->Fp,Lr */ "mov x1, sp\n\t" "stp x1, x30, [x0, #0x100]\n\t" /* context->Sp,Pc */ + "stp q0, q1, [x0, #0x110]\n\t" /* context->V[0-1] */ + "stp q2, q3, [x0, #0x130]\n\t" /* context->V[2-3] */ + "stp q4, q5, [x0, #0x150]\n\t" /* context->V[4-5] */ + "stp q6, q7, [x0, #0x170]\n\t" /* context->V[6-7] */ + "stp q8, q9, [x0, #0x190]\n\t" /* context->V[8-9] */ + "stp q10, q11, [x0, #0x1a0]\n\t" /* context->V[10-11] */ + "stp q12, q13, [x0, #0x1c0]\n\t" /* context->V[12-13] */ + "stp q14, q15, [x0, #0x1e0]\n\t" /* context->V[14-15] */ + "stp q16, q17, [x0, #0x210]\n\t" /* context->V[16-17] */ + "stp q18, q19, [x0, #0x230]\n\t" /* context->V[18-19] */ + "stp q20, q21, [x0, #0x250]\n\t" /* context->V[20-21] */ + "stp q22, q23, [x0, #0x270]\n\t" /* context->V[22-23] */ + "stp q24, q25, [x0, #0x290]\n\t" /* context->V[24-25] */ + "stp q26, q27, [x0, #0x2a0]\n\t" /* context->V[26-27] */ + "stp q28, q29, [x0, #0x2c0]\n\t" /* context->V[28-29] */ + "stp q30, q31, [x0, #0x2e0]\n\t" /* context->V[30-31] */ "mov w1, #0x400000\n\t" /* CONTEXT_ARM64 */ "movk w1, #0x7\n\t" /* CONTEXT_FULL */ "str w1, [x0]\n\t" /* context->ContextFlags */

1 0

Gijs Vermeulen : amstream: Implement IMediaStreamFilter::ReferenceTimeToStreamTime().
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: a53288e8c95d59b03eefe10f4963b555b04426aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=a53288e8c95d59b03eefe10f… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Aug 25 20:30:51 2020 +0200 amstream: Implement IMediaStreamFilter::ReferenceTimeToStreamTime(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/filter.c | 20 +++++++++++--- dlls/amstream/tests/amstream.c | 59 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 13fd30c3a5..b63a0301d6 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -616,11 +616,25 @@ static HRESULT WINAPI filter_SupportSeeking(IMediaStreamFilter *iface, BOOL rend return E_NOINTERFACE; } -static HRESULT WINAPI filter_ReferenceTimeToStreamTime(IMediaStreamFilter *iface, REFERENCE_TIME *pTime) +static HRESULT WINAPI filter_ReferenceTimeToStreamTime(IMediaStreamFilter *iface, REFERENCE_TIME *time) { - FIXME("(%p)->(%p): Stub!\n", iface, pTime); + struct filter *filter = impl_from_IMediaStreamFilter(iface); - return E_NOTIMPL; + TRACE("filter %p, time %p.\n", filter, time); + + EnterCriticalSection(&filter->cs); + + if (!filter->clock) + { + LeaveCriticalSection(&filter->cs); + return S_FALSE; + } + + *time -= filter->start_time; + + LeaveCriticalSection(&filter->cs); + + return S_OK; } static HRESULT WINAPI filter_GetCurrentStreamTime(IMediaStreamFilter *iface, REFERENCE_TIME *time) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index a25ae42a31..f4c033a180 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -5436,6 +5436,64 @@ static void test_mediastreamfilter_get_current_stream_time(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_mediastreamfilter_reference_time_to_stream_time(void) +{ + IMediaStreamFilter *filter; + struct testclock clock; + REFERENCE_TIME time; + HRESULT hr; + ULONG ref; + + hr = CoCreateInstance(&CLSID_MediaStreamFilter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaStreamFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + testclock_init(&clock); + + hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, &time); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(time == 0xdeadbeefdeadbeef, "Got time %s.\n", wine_dbgstr_longlong(time)); + + hr = IMediaStreamFilter_SetSyncSource(filter, &clock.IReferenceClock_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + clock.get_time_hr = E_FAIL; + + /* Crashes on native. */ + if (0) + { + hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + } + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 0xdeadbeefdeadbeef, "Got time %s.\n", wine_dbgstr_longlong(time)); + + hr = IMediaStreamFilter_Run(filter, 23456789); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 0xdeadbeefdd47d2da, "Got time %s.\n", wine_dbgstr_longlong(time)); + + clock.time = 34567890; + clock.get_time_hr = S_OK; + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 0xdeadbeefdd47d2da, "Got time %s.\n", wine_dbgstr_longlong(time)); + + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_ddrawstream_getsetdirectdraw(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -5892,6 +5950,7 @@ START_TEST(amstream) test_mediastreamfilter_get_duration(); test_mediastreamfilter_get_stop_position(); test_mediastreamfilter_get_current_stream_time(); + test_mediastreamfilter_reference_time_to_stream_time(); CoUninitialize(); }

1 0

Martin Storsjo : ntdll: Set handler_data correctly in arm64 RtlVirtualUnwind.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: a729af0e9c0027e7f9686df7e3d85ec1ab3cfb37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a729af0e9c0027e7f9686df7… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Aug 25 12:26:25 2020 +0300 ntdll: Set handler_data correctly in arm64 RtlVirtualUnwind. This matches what tests show is done on actual windows, in the current testcases; in all currently tested cases, handler_data is reset to NULL when no handler is returned. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 2 ++ dlls/ntdll/tests/exception.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 134e40545f..5521e915a7 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -889,6 +889,8 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG_PTR base, ULONG_PTR pc, TRACE( "type %x pc %lx sp %lx func %lx\n", type, pc, context->Sp, base + func->BeginAddress ); + *handler_data = NULL; + if (func->u.s.Flag) handler = unwind_packed_data( base, pc, func, context, ctx_ptr ); else diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index dd9eb966fc..1e9047383b 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4331,6 +4331,10 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) else { ok( handler == NULL, "%u/%u: handler %p instead of NULL\n", testnum, i, handler ); + ok( data == (test->results[i].handler < 0 ? + (void *)0xdeadbeef : NULL), + "%u/%u: handler data set to %p/%p\n", testnum, i, data, + (test->results[i].handler < 0 ? (void *)0xdeadbeef : NULL) ); } ok( context.Pc == test->results[i].pc, "%u/%u: wrong pc %p/%p\n",

1 0

Martin Storsjo : ntdll/tests: Add defines for the complete set of arm64 unwidning opcodes.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 8c0c70dd0f0cccfe1e2c9706f4645e7fce13078c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c0c70dd0f0cccfe1e2c9706… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Aug 25 12:26:26 2020 +0300 ntdll/tests: Add defines for the complete set of arm64 unwidning opcodes. Also correct the previous definition of UWOP_NOP which was a typo (but it wasn't used in any testcase yet). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 1e9047383b..528323c9bc 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4231,10 +4231,31 @@ static void test_debug_service(DWORD numexc) #define UWOP_TWOBYTES(x) (((x) >> 8) & 0xff), ((x) & 0xff) -#define UWOP_ALLOC_SMALL(size) (0x00 | (size / 16)) -#define UWOP_SAVE_REGP(reg, offset) UWOP_TWOBYTES((0xC8 << 8) | ((reg - 19) << 6) | (offset/8)) -#define UWOP_NOP 0xE5 -#define UWOP_END 0xE4 +#define UWOP_ALLOC_SMALL(size) (0x00 | (size/16)) +#define UWOP_SAVE_R19R20_X(offset) (0x20 | (offset/8)) +#define UWOP_SAVE_FPLR(offset) (0x40 | (offset/8)) +#define UWOP_SAVE_FPLR_X(offset) (0x80 | (offset/8 - 1)) +#define UWOP_ALLOC_MEDIUM(size) UWOP_TWOBYTES((0xC0 << 8) | (size/16)) +#define UWOP_SAVE_REGP(reg, offset) UWOP_TWOBYTES((0xC8 << 8) | ((reg - 19) << 6) | (offset/8)) +#define UWOP_SAVE_REGP_X(reg, offset) UWOP_TWOBYTES((0xCC << 8) | ((reg - 19) << 6) | (offset/8 - 1)) +#define UWOP_SAVE_REG(reg, offset) UWOP_TWOBYTES((0xD0 << 8) | ((reg - 19) << 6) | (offset/8)) +#define UWOP_SAVE_REG_X(reg, offset) UWOP_TWOBYTES((0xD4 << 8) | ((reg - 19) << 5) | (offset/8 - 1)) +#define UWOP_SAVE_LRP(reg, offset) UWOP_TWOBYTES((0xD6 << 8) | ((reg - 19)/2 << 6) | (offset/8)) +#define UWOP_SAVE_FREGP(reg, offset) UWOP_TWOBYTES((0xD8 << 8) | ((reg - 8) << 6) | (offset/8)) +#define UWOP_SAVE_FREGP_X(reg, offset) UWOP_TWOBYTES((0xDA << 8) | ((reg - 8) << 6) | (offset/8 - 1)) +#define UWOP_SAVE_FREG(reg, offset) UWOP_TWOBYTES((0xDC << 8) | ((reg - 8) << 6) | (offset/8)) +#define UWOP_SAVE_FREG_X(reg, offset) UWOP_TWOBYTES((0xDE << 8) | ((reg - 8) << 5) | (offset/8 - 1)) +#define UWOP_ALLOC_LARGE(size) UWOP_TWOBYTES((0xE0 << 8) | ((size/16) >> 16)), UWOP_TWOBYTES(size/16) +#define UWOP_SET_FP 0xE1 +#define UWOP_ADD_FP(offset) UWOP_TWOBYTES((0xE2 << 8) | (offset/8)) +#define UWOP_NOP 0xE3 +#define UWOP_END 0xE4 +#define UWOP_END_C 0xE5 +#define UWOP_SAVE_NEXT 0xE6 +#define UWOP_TRAP_FRAME 0xE8 +#define UWOP_MACHINE_FRAME 0xE9 +#define UWOP_CONTEXT 0xEA +#define UWOP_CLEAR_UNWOUND_TO_CALL 0xEC struct results {

1 0

Martin Storsjo : ntdll/tests: Support testing float registers in the arm64 virtual unwind test.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 41d1fd3229eaaa42f4057fbfa335e0e6d665233e URL: https://source.winehq.org/git/wine.git/?a=commit;h=41d1fd3229eaaa42f4057fbf… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Aug 25 12:26:27 2020 +0300 ntdll/tests: Support testing float registers in the arm64 virtual unwind test. Only testing d0-d15, not d16-d31, for keeping the test references a bit smaller. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 44 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 528323c9bc..6c6bb97d02 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4265,7 +4265,7 @@ struct results ULONG_PTR pc; /* expected final pc value */ int frame; /* expected frame return value */ int frame_offset; /* whether the frame return value is an offset or an absolute value */ - int regs[32][2]; /* expected values for registers */ + int regs[48][2]; /* expected values for registers */ }; struct unwind_test @@ -4283,15 +4283,19 @@ enum regs x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15, x16, x17, x18, x19, x20, x21, x22, x23, - x24, x25, x26, x27, x28, x29, lr, sp + x24, x25, x26, x27, x28, x29, lr, sp, + d0, d1, d2, d3, d4, d5, d6, d7, + d8, d9, d10, d11, d12, d13, d14, d15 }; -static const char * const reg_names[32] = +static const char * const reg_names[48] = { "x0", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16", "x17", "x18", "x19", "x20", "x21", "x22", "x23", - "x24", "x25", "x26", "x27", "x28", "x29", "lr", "sp" + "x24", "x25", "x26", "x27", "x28", "x29", "lr", "sp", + "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", + "d8", "d9", "d10", "d11", "d12", "d13", "d14", "d15", }; #define ORIG_LR 0xCCCCCCCC @@ -4376,10 +4380,12 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) } } ok( frame - sp_offset == context.Sp, "%u/%u: wrong sp %p/%p\n", - testnum, i, (void *)frame - sp_offset, (void *)context.Sp); + testnum, i, (void *)(frame - sp_offset), (void *)context.Sp); - for (j = 0; j < 31; j++) /* Not including sp here */ + for (j = 0; j < 48; j++) { + if (j == sp) continue; /* Handling sp separately above */ + for (k = 0; k < nb_regs; k++) { if (test->results[i].regs[k][0] == -1) @@ -4399,11 +4405,25 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) "%u/%u: register %s wrong %p/%x\n", testnum, i, reg_names[j], (void *)context.X[j], test->results[i].regs[k][1] ); } + else if (j >= d8 && j <= d15 && (&ctx_ptr.D8)[j - d8]) + { + ok( k < nb_regs, "%u/%u: register %s should not be set to %llx\n", + testnum, i, reg_names[j], context.V[j - d0].Low ); + if (k < nb_regs) + ok( context.V[j - d0].Low == test->results[i].regs[k][1], + "%u/%u: register %s wrong %p/%x\n", + testnum, i, reg_names[j], (void *)context.V[j - d0].Low, test->results[i].regs[k][1] ); + } else if (k < nb_regs) { - ok( context.X[j] == test->results[i].regs[k][1], - "%u/%u: register %s wrong %p/%x\n", - testnum, i, reg_names[j], (void *)context.X[j], test->results[i].regs[k][1] ); + if (j < d0) + ok( context.X[j] == test->results[i].regs[k][1], + "%u/%u: register %s wrong %p/%x\n", + testnum, i, reg_names[j], (void *)context.X[j], test->results[i].regs[k][1] ); + else + ok( context.V[j - d0].Low == test->results[i].regs[k][1], + "%u/%u: register %s wrong %p/%x\n", + testnum, i, reg_names[j], (void *)context.V[j - d0].Low, test->results[i].regs[k][1] ); } else { @@ -4414,10 +4434,14 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) else if (j == x29) ok( context.Fp == orig_fp, "%u/%u: register fp wrong %p/unset\n", testnum, i, (void *)context.Fp ); - else + else if (j < d0) ok( context.X[j] == unset_reg, "%u/%u: register %s wrong %p/unset\n", testnum, i, reg_names[j], (void *)context.X[j]); + else + ok( context.V[j - d0].Low == unset_reg, + "%u/%u: register %s wrong %p/unset\n", + testnum, i, reg_names[j], (void *)context.V[j - d0].Low); } } }

1 0

Martin Storsjo : ntdll: Implement the arm64 machine frame and context unwind opcodes.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: bc3284f818f70d2de0bc76beaa69a3352f27fd34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc3284f818f70d2de0bc76be… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Aug 25 12:26:28 2020 +0300 ntdll: Implement the arm64 machine frame and context unwind opcodes. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 13 ++++++- dlls/ntdll/tests/exception.c | 82 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 5521e915a7..719c71f952 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -635,6 +635,15 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, CONTEXT *context, ptr += len; continue; } + else if (*ptr == 0xe9) /* MSFT_OP_MACHINE_FRAME */ + { + context->Pc = ((DWORD64 *)context->Sp)[1]; + context->Sp = ((DWORD64 *)context->Sp)[0]; + } + else if (*ptr == 0xea) /* MSFT_OP_CONTEXT */ + { + memcpy( context, (DWORD64 *)context->Sp, sizeof(CONTEXT) ); + } else { WARN( "unsupported code %02x\n", *ptr ); @@ -891,13 +900,15 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG_PTR base, ULONG_PTR pc, *handler_data = NULL; + context->Pc = 0; if (func->u.s.Flag) handler = unwind_packed_data( base, pc, func, context, ctx_ptr ); else handler = unwind_full_data( base, pc, func, context, handler_data, ctx_ptr ); TRACE( "ret: lr=%lx sp=%lx handler=%p\n", context->u.s.Lr, context->Sp, handler ); - context->Pc = context->u.s.Lr; + if (!context->Pc) + context->Pc = context->u.s.Lr; context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; *frame_ret = context->Sp; return handler; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 6c6bb97d02..d53b7b659c 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4539,12 +4539,94 @@ static void test_virtual_unwind(void) #endif }; + static const BYTE function_2[] = + { + 0xff, 0x43, 0x00, 0xd1, /* 00: sub sp, sp, #16 */ + 0x1f, 0x20, 0x03, 0xd5, /* 04: nop */ + 0xff, 0x43, 0x00, 0xd1, /* 08: sub sp, sp, #16 */ + 0x1f, 0x20, 0x03, 0xd5, /* 0c: nop */ + 0xc0, 0x03, 0x5f, 0xd6, /* 10: ret */ + }; + + static const DWORD unwind_info_2_header = + (sizeof(function_2)/4) | /* function length */ + (0 << 20) | /* X */ + (0 << 21) | /* E */ + (0 << 22) | /* epilog */ + (1 << 27); /* codes */ + + static const BYTE unwind_info_2[] = + { + DW(unwind_info_2_header), + + UWOP_ALLOC_SMALL(16), /* sub sp, sp, #16 */ + UWOP_MACHINE_FRAME, + UWOP_ALLOC_SMALL(16), /* sub sp, sp, #16 */ + UWOP_END, + }; + + /* Partial prologues with the custom frame opcodes (machine frame, + * context) behave like there's an off-by-one bug; unwinding from + * offset 0, which normally does nothing, executes one opcode if + * there's a machine frame or context in the prologue, and for other + * offsets, it behaves like unwinding from one instruction further + * ahead. So only test the full prologue case. */ + static const struct results results_2[] = + { + /* offset fp handler pc frame offset registers */ +#if 0 + { 0x00, 0x00, 0, ORIG_LR, 0x010, TRUE, { {-1,-1} }}, + { 0x04, 0x00, 0, 0x0008, 0x010, FALSE, { {-1,-1} }}, + { 0x08, 0x00, 0, 0x0018, 0x020, FALSE, { {-1,-1} }}, +#endif + { 0x0c, 0x00, 0, 0x0018, 0x020, FALSE, { {-1,-1} }}, + }; + + static const BYTE function_3[] = + { + 0xff, 0x43, 0x00, 0xd1, /* 00: sub sp, sp, #16 */ + 0x1f, 0x20, 0x03, 0xd5, /* 04: nop */ + 0xff, 0x43, 0x00, 0xd1, /* 08: sub sp, sp, #16 */ + 0x1f, 0x20, 0x03, 0xd5, /* 0c: nop */ + 0xc0, 0x03, 0x5f, 0xd6, /* 10: ret */ + }; + + static const DWORD unwind_info_3_header = + (sizeof(function_3)/4) | /* function length */ + (0 << 20) | /* X */ + (0 << 21) | /* E */ + (0 << 22) | /* epilog */ + (1 << 27); /* codes */ + + static const BYTE unwind_info_3[] = + { + DW(unwind_info_3_header), + + UWOP_ALLOC_SMALL(16), /* sub sp, sp, #16 */ + UWOP_CONTEXT, + UWOP_ALLOC_SMALL(16), /* sub sp, sp, #16 */ + UWOP_END, + }; + + static const struct results results_3[] = + { + /* offset fp handler pc frame offset registers */ +#if 0 + { 0x00, 0x00, 0, ORIG_LR, 0x010, TRUE, { {-1,-1} }}, + { 0x04, 0x00, 0 , 0x0108, 0x110, FALSE, { {x0, 0x08}, {x1, 0x10}, {x2, 0x18}, {x3, 0x20}, {x4, 0x28}, {x5, 0x30}, {x6, 0x38}, {x7, 0x40}, {x8, 0x48}, {x9, 0x50}, {x10, 0x58}, {x11, 0x60}, {x12, 0x68}, {x13, 0x70}, {x14, 0x78}, {x15, 0x80}, {x16, 0x88}, {x17, 0x90}, {x18, 0x98}, {x19, 0xA0}, {x20, 0xA8}, {x21, 0xB0}, {x22, 0xB8}, {x23, 0xC0}, {x24, 0xC8}, {x25, 0xD0}, {x26, 0xD8}, {x27, 0xE0}, {x28, 0xE8}, {x29, 0xF0}, {lr, 0xF8}, {d0, 0x110}, {d1, 0x120}, {d2, 0x130}, {d3, 0x140}, {d4, 0x150}, {d5, 0x160}, {d6, 0x170}, {d7, 0x180}, {d8, 0x190}, {d9, 0x1a0}, {d10, 0x1b0}, {d11, 0x1c0}, {d12, 0x1d0}, {d13, 0x1e0}, {d14, 0x1f0}, {d15, 0x200}, {-1,-1} }}, + { 0x08, 0x00, 0 , 0x0118, 0x120, FALSE, { {x0, 0x18}, {x1, 0x20}, {x2, 0x28}, {x3, 0x30}, {x4, 0x38}, {x5, 0x40}, {x6, 0x48}, {x7, 0x50}, {x8, 0x58}, {x9, 0x60}, {x10, 0x68}, {x11, 0x70}, {x12, 0x78}, {x13, 0x80}, {x14, 0x88}, {x15, 0x90}, {x16, 0x98}, {x17, 0xA0}, {x18, 0xA8}, {x19, 0xB0}, {x20, 0xB8}, {x21, 0xC0}, {x22, 0xC8}, {x23, 0xD0}, {x24, 0xD8}, {x25, 0xE0}, {x26, 0xE8}, {x27, 0xF0}, {x28, 0xF8}, {x29, 0x100}, {lr, 0x108}, {d0, 0x120}, {d1, 0x130}, {d2, 0x140}, {d3, 0x150}, {d4, 0x160}, {d5, 0x170}, {d6, 0x180}, {d7, 0x190}, {d8, 0x1a0}, {d9, 0x1b0}, {d10, 0x1c0}, {d11, 0x1d0}, {d12, 0x1e0}, {d13, 0x1f0}, {d14, 0x200}, {d15, 0x210}, {-1,-1} }}, +#endif + { 0x0c, 0x00, 0 , 0x0118, 0x120, FALSE, { {x0, 0x18}, {x1, 0x20}, {x2, 0x28}, {x3, 0x30}, {x4, 0x38}, {x5, 0x40}, {x6, 0x48}, {x7, 0x50}, {x8, 0x58}, {x9, 0x60}, {x10, 0x68}, {x11, 0x70}, {x12, 0x78}, {x13, 0x80}, {x14, 0x88}, {x15, 0x90}, {x16, 0x98}, {x17, 0xA0}, {x18, 0xA8}, {x19, 0xB0}, {x20, 0xB8}, {x21, 0xC0}, {x22, 0xC8}, {x23, 0xD0}, {x24, 0xD8}, {x25, 0xE0}, {x26, 0xE8}, {x27, 0xF0}, {x28, 0xF8}, {x29, 0x100}, {lr, 0x108}, {d0, 0x120}, {d1, 0x130}, {d2, 0x140}, {d3, 0x150}, {d4, 0x160}, {d5, 0x170}, {d6, 0x180}, {d7, 0x190}, {d8, 0x1a0}, {d9, 0x1b0}, {d10, 0x1c0}, {d11, 0x1d0}, {d12, 0x1e0}, {d13, 0x1f0}, {d14, 0x200}, {d15, 0x210}, {-1,-1} }}, + }; + static const struct unwind_test tests[] = { #define TEST(func, unwind, unwind_packed, results) \ { func, sizeof(func), unwind, unwind_packed ? 0 : sizeof(unwind), results, ARRAY_SIZE(results) } TEST(function_0, unwind_info_0, 0, results_0), TEST(function_1, unwind_info_1, 1, results_1), + TEST(function_2, unwind_info_2, 0, results_2), + TEST(function_3, unwind_info_3, 0, results_3), #undef TEST }; unsigned int i;

1 0