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

Alexandre Julliard : ntdll: Use exported APIs instead of virtual_map_section() to load PE modules.
by Alexandre Julliard Aug. 26, 2020

Aug. 26, 2020

Module: wine Branch: master Commit: 65c37cee249984884af40d91aa14706d81e128bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=65c37cee249984884af40d91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 26 13:02:02 2020 +0200 ntdll: Use exported APIs instead of virtual_map_section() to load PE modules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 75 ++++++++++++++++++++++-------------------- dlls/ntdll/unix/loader.c | 37 ++++++++++++++++----- dlls/ntdll/unix/unix_private.h | 3 -- dlls/ntdll/unix/virtual.c | 8 ++--- dlls/ntdll/unixlib.h | 7 ++-- 5 files changed, 73 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=65c37cee249984884af4…

1 0

Zhiyi Zhang : winex11.drv: Store a full display mode in registry.
by Alexandre Julliard Aug. 26, 2020

Aug. 26, 2020

Module: wine Branch: master Commit: 1aa7c9af90c340f45e03c6b94525704ad19eb657 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1aa7c9af90c340f45e03c6b9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 25 15:12:09 2020 +0800 winex11.drv: Store a full display mode in registry. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 11 +++-------- dlls/winex11.drv/settings.c | 48 ++++++++++++++++++++++++++++----------------- 2 files changed, 33 insertions(+), 26 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 7cd41145ea..9a7efb8e9b 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -749,8 +749,8 @@ static void test_ChangeDisplaySettingsEx(void) "Expected dmPelsWidth %u, got %u.\n", dm3.dmPelsWidth, dm.dmPelsWidth); ok(dm.dmPelsHeight == dm3.dmPelsHeight || broken(dm.dmPelsHeight == dm2.dmPelsHeight), /* Win10 */ "Expected dmPelsHeight %u, got %u.\n", dm3.dmPelsHeight, dm.dmPelsHeight); - todo_wine ok(dm.dmBitsPerPel, "Expected dmBitsPerPel not zero.\n"); - todo_wine ok(dm.dmDisplayFrequency, "Expected dmDisplayFrequency not zero.\n"); + ok(dm.dmBitsPerPel, "Expected dmBitsPerPel not zero.\n"); + ok(dm.dmDisplayFrequency, "Expected dmDisplayFrequency not zero.\n"); } else { @@ -758,12 +758,7 @@ static void test_ChangeDisplaySettingsEx(void) } res = ChangeDisplaySettingsExA(devices[device].name, NULL, NULL, 0, NULL); - todo_wine ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned %d.\n", devices[device].name, res); - if (res != DISP_CHANGE_SUCCESSFUL) - { - skip("ChangeDisplaySettingsExA %s returned %d.\n", devices[device].name, res); - continue; - } + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned %d.\n", devices[device].name, res); flush_events(); res = EnumDisplaySettingsA(devices[device].name, ENUM_REGISTRY_SETTINGS, &dm); diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index c4929e9b58..7827ede656 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -456,12 +456,15 @@ BOOL is_detached_mode(const DEVMODEW *mode) } /* Get the full display mode with all the necessary fields set. - * Return NULL on failure. Caller should free the returned mode. */ -static DEVMODEW *get_full_mode(ULONG_PTR id, const DEVMODEW *dev_mode) + * Return NULL on failure. Caller should call free_full_mode() to free the returned mode. */ +static DEVMODEW *get_full_mode(ULONG_PTR id, DEVMODEW *dev_mode) { DEVMODEW *modes, *full_mode, *found_mode = NULL; UINT mode_count, mode_idx; + if (is_detached_mode(dev_mode)) + return dev_mode; + if (!handler.get_modes(id, 0, &modes, &mode_count)) return NULL; @@ -500,9 +503,18 @@ static DEVMODEW *get_full_mode(ULONG_PTR id, const DEVMODEW *dev_mode) memcpy(full_mode, found_mode, sizeof(*found_mode) + found_mode->dmDriverExtra); handler.free_modes(modes); + + full_mode->dmFields |= DM_POSITION; + full_mode->u1.s2.dmPosition = dev_mode->u1.s2.dmPosition; return full_mode; } +static void free_full_mode(DEVMODEW *mode) +{ + if (!is_detached_mode(mode)) + heap_free(mode); +} + static LONG get_display_settings(struct x11drv_display_setting **new_displays, INT *new_display_count, const WCHAR *dev_name, DEVMODEW *dev_mode) { @@ -781,19 +793,9 @@ static LONG apply_display_settings(struct x11drv_display_setting *displays, INT if ((attached_mode && !do_attach) || (!attached_mode && do_attach)) continue; - if (attached_mode) - { - full_mode = get_full_mode(displays[display_idx].id, &displays[display_idx].desired_mode); - if (!full_mode) - return DISP_CHANGE_BADMODE; - - full_mode->dmFields |= DM_POSITION; - full_mode->u1.s2.dmPosition = displays[display_idx].desired_mode.u1.s2.dmPosition; - } - else - { - full_mode = &displays[display_idx].desired_mode; - } + full_mode = get_full_mode(displays[display_idx].id, &displays[display_idx].desired_mode); + if (!full_mode) + return DISP_CHANGE_BADMODE; TRACE("handler:%s changing %s to position:(%d,%d) resolution:%ux%u frequency:%uHz " "depth:%ubits orientation:%#x.\n", handler.name, @@ -803,8 +805,7 @@ static LONG apply_display_settings(struct x11drv_display_setting *displays, INT full_mode->u1.s2.dmDisplayOrientation); ret = handler.set_current_mode(displays[display_idx].id, full_mode); - if (attached_mode) - heap_free(full_mode); + free_full_mode(full_mode); if (ret != DISP_CHANGE_SUCCESSFUL) return ret; } @@ -834,6 +835,7 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, { struct x11drv_display_setting *displays; INT display_idx, display_count; + DEVMODEW *full_mode; LONG ret; ret = get_display_settings(&displays, &display_count, devname, devmode); @@ -846,12 +848,22 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, { if (!lstrcmpiW(displays[display_idx].desired_mode.dmDeviceName, devname)) { - if (!write_registry_settings(devname, &displays[display_idx].desired_mode)) + full_mode = get_full_mode(displays[display_idx].id, &displays[display_idx].desired_mode); + if (!full_mode) + { + heap_free(displays); + return DISP_CHANGE_BADMODE; + } + + if (!write_registry_settings(devname, full_mode)) { ERR("Failed to write %s display settings to registry.\n", wine_dbgstr_w(devname)); + free_full_mode(full_mode); heap_free(displays); return DISP_CHANGE_NOTUPDATED; } + + free_full_mode(full_mode); break; } }

1 0

Zhiyi Zhang : user32/tests: Add more registry display mode tests.
by Alexandre Julliard Aug. 26, 2020

Aug. 26, 2020

Module: wine Branch: master Commit: fd29fe4ea73d87e39bd3d0ddd791c14f536508b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd29fe4ea73d87e39bd3d0dd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 25 15:11:56 2020 +0800 user32/tests: Add more registry display mode tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 102 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 87 insertions(+), 15 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index b151721533..7cd41145ea 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -298,34 +298,38 @@ static void _expect_dm(INT line, DEVMODEA expected, const CHAR *device, DWORD te ok_(__FILE__, line)((dm.dmFields & expected.dmFields) == expected.dmFields, "Device %s test %d expect dmFields to contain %#x, got %#x\n", device, test, expected.dmFields, dm.dmFields); /* Wine doesn't support changing color depth yet */ - todo_wine_if(expected.dmBitsPerPel != 32 && expected.dmBitsPerPel != 24) - ok_(__FILE__, line)(dm.dmBitsPerPel == expected.dmBitsPerPel, "Device %s test %d expect dmBitsPerPel %d, got %d\n", - device, test, expected.dmBitsPerPel, dm.dmBitsPerPel); - ok_(__FILE__, line)(dm.dmPelsWidth == expected.dmPelsWidth, "Device %s test %d expect dmPelsWidth %d, got %d\n", - device, test, expected.dmPelsWidth, dm.dmPelsWidth); - ok_(__FILE__, line)(dm.dmPelsHeight == expected.dmPelsHeight, "Device %s test %d expect dmPelsHeight %d, got %d\n", - device, test, expected.dmPelsHeight, dm.dmPelsHeight); - ok_(__FILE__, line)(dm.dmPosition.x == expected.dmPosition.x, "Device %s test %d expect dmPosition.x %d, got %d\n", - device, test, expected.dmPosition.x, dm.dmPosition.x); - ok_(__FILE__, line)(dm.dmPosition.y == expected.dmPosition.y, "Device %s test %d expect dmPosition.y %d, got %d\n", - device, test, expected.dmPosition.y, dm.dmPosition.y); - ok_(__FILE__, line)(dm.dmDisplayFrequency == expected.dmDisplayFrequency, - "Device %s test %d expect dmDisplayFrequency %d, got %d\n", device, test, expected.dmDisplayFrequency, + todo_wine_if(expected.dmFields & DM_BITSPERPEL && expected.dmBitsPerPel != 32 && expected.dmBitsPerPel != 24) + ok_(__FILE__, line)(!(expected.dmFields & DM_BITSPERPEL) || dm.dmBitsPerPel == expected.dmBitsPerPel, + "Device %s test %d expect dmBitsPerPel %u, got %u\n", device, test, expected.dmBitsPerPel, dm.dmBitsPerPel); + ok_(__FILE__, line)(!(expected.dmFields & DM_PELSWIDTH) || dm.dmPelsWidth == expected.dmPelsWidth, + "Device %s test %d expect dmPelsWidth %u, got %u\n", device, test, expected.dmPelsWidth, dm.dmPelsWidth); + ok_(__FILE__, line)(!(expected.dmFields & DM_PELSHEIGHT) || dm.dmPelsHeight == expected.dmPelsHeight, + "Device %s test %d expect dmPelsHeight %u, got %u\n", device, test, expected.dmPelsHeight, dm.dmPelsHeight); + ok_(__FILE__, line)(!(expected.dmFields & DM_POSITION) || dm.dmPosition.x == expected.dmPosition.x, + "Device %s test %d expect dmPosition.x %d, got %d\n", device, test, expected.dmPosition.x, dm.dmPosition.x); + ok_(__FILE__, line)(!(expected.dmFields & DM_POSITION) || dm.dmPosition.y == expected.dmPosition.y, + "Device %s test %d expect dmPosition.y %d, got %d\n", device, test, expected.dmPosition.y, dm.dmPosition.y); + ok_(__FILE__, line)(!(expected.dmFields & DM_DISPLAYFREQUENCY) || + dm.dmDisplayFrequency == expected.dmDisplayFrequency, + "Device %s test %d expect dmDisplayFrequency %u, got %u\n", device, test, expected.dmDisplayFrequency, dm.dmDisplayFrequency); - ok_(__FILE__, line)(dm.dmDisplayOrientation == expected.dmDisplayOrientation, + ok_(__FILE__, line)(!(expected.dmFields & DM_DISPLAYORIENTATION) || + dm.dmDisplayOrientation == expected.dmDisplayOrientation, "Device %s test %d expect dmDisplayOrientation %d, got %d\n", device, test, expected.dmDisplayOrientation, dm.dmDisplayOrientation); } static void test_ChangeDisplaySettingsEx(void) { + static const DWORD registry_fields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | + DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY | DM_POSITION; DPI_AWARENESS_CONTEXT context = NULL; UINT primary, device, test, mode; UINT device_size, device_count; struct device_info *devices; + DEVMODEA dm, dm2, dm3; INT count, old_count; DISPLAY_DEVICEA dd; - DEVMODEA dm, dm2; POINTL position; DEVMODEW dmW; LONG res; @@ -672,10 +676,26 @@ static void test_ChangeDisplaySettingsEx(void) /* Test changing modes by saving settings to the registry first */ for (device = 0; device < device_count; ++device) { + /* Place adapter to the right */ + if (device == 0) + { + position.x = 0; + position.y = 0; + } + else + { + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + res = EnumDisplaySettingsA(devices[device - 1].name, ENUM_CURRENT_SETTINGS, &dm); + ok(res, "EnumDisplaySettingsA %s failed, error %#x.\n", devices[device - 1].name, GetLastError()); + position.x = dm.dmPosition.x + dm.dmPelsWidth; + } + memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); res = EnumDisplaySettingsA(devices[device].name, ENUM_CURRENT_SETTINGS, &dm); ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[device].name, GetLastError()); + dm3 = dm; /* Find a mode that's different from the current mode */ memset(&dm2, 0, sizeof(dm2)); @@ -687,6 +707,8 @@ static void test_ChangeDisplaySettingsEx(void) } ok(dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight, "Failed to find a different mode.\n"); + /* Test normal operation */ + dm.dmPosition = position; dm.dmPelsWidth = dm2.dmPelsWidth; dm.dmPelsHeight = dm2.dmPelsHeight; dm.dmDisplayFrequency = dm2.dmDisplayFrequency; @@ -706,6 +728,56 @@ static void test_ChangeDisplaySettingsEx(void) flush_events(); expect_dm(dm, devices[device].name, 0); + + /* Test specifying only position, width and height */ + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + dm.dmFields = DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT; + dm.dmPosition = position; + dm.dmPelsWidth = dm3.dmPelsWidth; + dm.dmPelsHeight = dm3.dmPelsHeight; + res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned %d.\n", devices[device].name, res); + res = EnumDisplaySettingsA(devices[device].name, ENUM_REGISTRY_SETTINGS, &dm); + /* Win10 either returns failure here or retrieves outdated display settings until they're applied */ + if (res) + { + ok((dm.dmFields & registry_fields) == registry_fields, "Got unexpected dmFields %#x.\n", dm.dmFields); + ok(dm.dmPosition.x == position.x, "Expected dmPosition.x %d, got %d.\n", position.x, dm.dmPosition.x); + ok(dm.dmPosition.y == position.y, "Expected dmPosition.y %d, got %d.\n", position.y, dm.dmPosition.y); + ok(dm.dmPelsWidth == dm3.dmPelsWidth || broken(dm.dmPelsWidth == dm2.dmPelsWidth), /* Win10 */ + "Expected dmPelsWidth %u, got %u.\n", dm3.dmPelsWidth, dm.dmPelsWidth); + ok(dm.dmPelsHeight == dm3.dmPelsHeight || broken(dm.dmPelsHeight == dm2.dmPelsHeight), /* Win10 */ + "Expected dmPelsHeight %u, got %u.\n", dm3.dmPelsHeight, dm.dmPelsHeight); + todo_wine ok(dm.dmBitsPerPel, "Expected dmBitsPerPel not zero.\n"); + todo_wine ok(dm.dmDisplayFrequency, "Expected dmDisplayFrequency not zero.\n"); + } + else + { + win_skip("EnumDisplaySettingsA %s failed, error %#x.\n", devices[device].name, GetLastError()); + } + + res = ChangeDisplaySettingsExA(devices[device].name, NULL, NULL, 0, NULL); + todo_wine ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned %d.\n", devices[device].name, res); + if (res != DISP_CHANGE_SUCCESSFUL) + { + skip("ChangeDisplaySettingsExA %s returned %d.\n", devices[device].name, res); + continue; + } + flush_events(); + + res = EnumDisplaySettingsA(devices[device].name, ENUM_REGISTRY_SETTINGS, &dm); + ok(res, "EnumDisplaySettingsA %s failed, error %#x.\n", devices[device].name, GetLastError()); + ok((dm.dmFields & registry_fields) == registry_fields, "Got unexpected dmFields %#x.\n", dm.dmFields); + ok(dm.dmPosition.x == position.x, "Expected dmPosition.x %d, got %d.\n", position.x, dm.dmPosition.x); + ok(dm.dmPosition.y == position.y, "Expected dmPosition.y %d, got %d.\n", position.y, dm.dmPosition.y); + ok(dm.dmPelsWidth == dm3.dmPelsWidth, "Expected dmPelsWidth %u, got %u.\n", dm3.dmPelsWidth, dm.dmPelsWidth); + ok(dm.dmPelsHeight == dm3.dmPelsHeight, "Expected dmPelsHeight %u, got %u.\n", dm3.dmPelsHeight, + dm.dmPelsHeight); + ok(dm.dmBitsPerPel, "Expected dmBitsPerPel not zero.\n"); + ok(dm.dmDisplayFrequency, "Expected dmDisplayFrequency not zero.\n"); + + expect_dm(dm, devices[device].name, 0); } /* Test dmPosition */

1 0

Zebediah Figura : vkd3d-shader: Do not check for NULL in vkd3d_shader_free_shader_code().
by Alexandre Julliard Aug. 26, 2020

Aug. 26, 2020

Module: vkd3d Branch: master Commit: f895f0dce6149b2c9aa0b386aeb70f8eae633d8d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f895f0dce6149b2c9aa0b38… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 24 11:16:45 2020 -0500 vkd3d-shader: Do not check for NULL in vkd3d_shader_free_shader_code(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 68e23da..e3abaf7 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -917,9 +917,6 @@ void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_ void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *shader_code) { - if (!shader_code) - return; - vkd3d_free((void *)shader_code->code); }

1 0

Zebediah Figura : vkd3d-shader: Do not check for NULL in vkd3d_shader_free_scan_descriptor_info().
by Alexandre Julliard Aug. 26, 2020

Aug. 26, 2020

Module: vkd3d Branch: master Commit: 6c10b5280444d5c6219d3c557a3d6f1c994a33eb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6c10b5280444d5c6219d3c5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 25 10:22:28 2020 -0500 vkd3d-shader: Do not check for NULL in vkd3d_shader_free_scan_descriptor_info(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index e0a04fc..68e23da 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -884,14 +884,16 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char if (instruction.handler_idx == VKD3DSIH_INVALID) { WARN("Encountered unrecognized or invalid instruction.\n"); - vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); + if (scan_descriptor_info) + vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); ret = VKD3D_ERROR_INVALID_SHADER; goto done; } if ((ret = vkd3d_shader_scan_instruction(&context, &instruction)) < 0) { - vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); + if (scan_descriptor_info) + vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); goto done; } ++message_context->line; @@ -910,9 +912,6 @@ done: void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info) { - if (!scan_descriptor_info) - return; - vkd3d_free(scan_descriptor_info->descriptors); }

1 0

Ziqing Hui : windowscodecs: Introduce get_dds_format() to replace get_dxgi_format().
by Alexandre Julliard Aug. 25, 2020

Aug. 25, 2020

Module: wine Branch: master Commit: a017f701f3bc60e66dcd46c8f6d0127c13331ddf URL: https://source.winehq.org/git/wine.git/?a=commit;h=a017f701f3bc60e66dcd46c8… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Aug 25 22:00:47 2020 +0800 windowscodecs: Introduce get_dds_format() to replace get_dxgi_format(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 75fa911797..d16fc9700d 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -166,7 +166,7 @@ static struct dds_format { const GUID *wic_format; UINT wic_format_bpp; DXGI_FORMAT dxgi_format; -} dds_formats[] = { +} dds_format_table[] = { { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '1'), 0, 0, 0, 0, 0 }, &GUID_WICPixelFormat32bppPBGRA, 32, DXGI_FORMAT_BC1_UNORM }, { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '2'), 0, 0, 0, 0, 0 }, @@ -239,7 +239,8 @@ static struct dds_format { { { sizeof(DDS_PIXELFORMAT), DDPF_LUMINANCE, 0, 16, 0xFF,0,0,0xFF00 }, &GUID_WICPixelFormatUndefined, 0, DXGI_FORMAT_R8G8_UNORM }, { { sizeof(DDS_PIXELFORMAT), DDPF_LUMINANCE, 0, 8, 0xFF,0,0,0 }, - &GUID_WICPixelFormat8bppGray, 8, DXGI_FORMAT_R8_UNORM } + &GUID_WICPixelFormat8bppGray, 8, DXGI_FORMAT_R8_UNORM }, + { { 0 }, &GUID_WICPixelFormatUndefined, 0, DXGI_FORMAT_UNKNOWN } }; static DXGI_FORMAT compressed_formats[] = { @@ -289,23 +290,23 @@ static WICDdsDimension get_dimension(DDS_HEADER *header, DDS_HEADER_DXT10 *heade } } -static DXGI_FORMAT get_dxgi_format(DDS_PIXELFORMAT *pixel_format) +static struct dds_format *get_dds_format(DDS_PIXELFORMAT *pixel_format) { UINT i; - for (i = 0; i < ARRAY_SIZE(dds_formats); i++) + for (i = 0; i < ARRAY_SIZE(dds_format_table); i++) { - if ((pixel_format->flags & dds_formats[i].pixel_format.flags) && - (pixel_format->fourCC == dds_formats[i].pixel_format.fourCC) && - (pixel_format->rgbBitCount == dds_formats[i].pixel_format.rgbBitCount) && - (pixel_format->rBitMask == dds_formats[i].pixel_format.rBitMask) && - (pixel_format->gBitMask == dds_formats[i].pixel_format.gBitMask) && - (pixel_format->bBitMask == dds_formats[i].pixel_format.bBitMask) && - (pixel_format->aBitMask == dds_formats[i].pixel_format.aBitMask)) - return dds_formats[i].dxgi_format; + if ((pixel_format->flags & dds_format_table[i].pixel_format.flags) && + (pixel_format->fourCC == dds_format_table[i].pixel_format.fourCC) && + (pixel_format->rgbBitCount == dds_format_table[i].pixel_format.rgbBitCount) && + (pixel_format->rBitMask == dds_format_table[i].pixel_format.rBitMask) && + (pixel_format->gBitMask == dds_format_table[i].pixel_format.gBitMask) && + (pixel_format->bBitMask == dds_format_table[i].pixel_format.bBitMask) && + (pixel_format->aBitMask == dds_format_table[i].pixel_format.aBitMask)) + return dds_format_table + i; } - return DXGI_FORMAT_UNKNOWN; + return dds_format_table + ARRAY_SIZE(dds_format_table) - 1; } static WICDdsAlphaMode get_alpha_mode_from_fourcc(DWORD fourcc) @@ -452,6 +453,7 @@ static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *h { int i; UINT depth; + struct dds_format *format_info; info->width = header->width; info->height = header->height; @@ -461,6 +463,7 @@ static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *h if (header->depth) info->depth = header->depth; if (header->mipMapCount) info->mip_levels = header->mipMapCount; + format_info = get_dds_format(&header->ddspf); if (has_extended_header(header)) { if (header_dxt10->arraySize) info->array_size = header_dxt10->arraySize; info->format = header_dxt10->dxgiFormat; @@ -468,7 +471,7 @@ static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *h info->alpha_mode = header_dxt10->miscFlags2 & 0x00000008; info->data_offset = sizeof(DWORD) + sizeof(*header) + sizeof(*header_dxt10); } else { - info->format = get_dxgi_format(&header->ddspf); + 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);

1 0

Ziqing Hui : windowscodecs: Remove get_pixel_format_bpp().
by Alexandre Julliard Aug. 25, 2020

Aug. 25, 2020

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

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

Aug. 25, 2020

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

Ziqing Hui : windowscodecs/tests: Expect actual WIC formats for uncompressed image.
by Alexandre Julliard Aug. 25, 2020

Aug. 25, 2020

Module: wine Branch: master Commit: 6c0c5e9c5bd18b5ee0056432497635dc218e7010 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c0c5e9c5bd18b5ee0056432… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Aug 25 22:00:56 2020 +0800 windowscodecs/tests: Expect actual WIC formats for uncompressed image. 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 | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 43f266d392..2d78319375 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -394,23 +394,23 @@ static struct test_data { WICDdsParameters expected_parameters; BOOL wine_init; } test_data[] = { - { test_dds_alpha, sizeof(test_dds_alpha), WINCODEC_ERR_BADHEADER, 1, 1, &GUID_WICPixelFormat32bppBGRA, + { test_dds_alpha, sizeof(test_dds_alpha), WINCODEC_ERR_BADHEADER, 1, 1, &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_WICPixelFormat32bppBGRA, + { test_dds_luminance, sizeof(test_dds_luminance), WINCODEC_ERR_BADHEADER, 1, 1, &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_WICPixelFormat32bppBGRA, + { test_dds_rgb565, sizeof(test_dds_rgb565), WINCODEC_ERR_BADHEADER, 1, 2, &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_WICPixelFormat32bppBGRA, + { test_dds_24bpp, sizeof(test_dds_24bpp), WINCODEC_ERR_BADHEADER, 1, 3, &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_WICPixelFormat32bppBGRA, + { test_dds_32bpp_xrgb, sizeof(test_dds_32bpp_xrgb), WINCODEC_ERR_BADHEADER, 1, 4, &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, { 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_WICPixelFormat32bppBGRA, + { test_dds_64bpp, sizeof(test_dds_64bpp), WINCODEC_ERR_BADHEADER, 1, 8, &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_WICPixelFormat32bppBGRA, + { test_dds_96bpp, sizeof(test_dds_96bpp), WINCODEC_ERR_BADHEADER, 1, 12, &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_WICPixelFormat32bppBGRA, + { test_dds_128bpp, sizeof(test_dds_128bpp), WINCODEC_ERR_BADHEADER, 1, 16, &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, { 4, 4, 1, 3, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTextureCube, WICDdsAlphaModePremultiplied }, TRUE }, @@ -936,6 +936,8 @@ static void test_dds_decoder_frame_properties(IWICBitmapFrameDecode *frame_decod hr = IWICBitmapFrameDecode_GetPixelFormat(frame_decode, &pixel_format); ok(hr == S_OK, "Test %u, frame %u: GetPixelFormat failed, hr %#x\n", i, frame_index, hr); if (hr != S_OK) return; + todo_wine_if(!IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat32bppBGRA) && + !IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat32bppPBGRA)) ok(IsEqualGUID(&pixel_format, test_data[i].expected_pixel_format), "Test %u, frame %u: Expected pixel format %s, got %s\n", i, frame_index, debugstr_guid(test_data[i].expected_pixel_format), debugstr_guid(&pixel_format));

1 0

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

Aug. 25, 2020

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