May 2021 - Wine-Commits - list.winehq.org

Zhiyi Zhang : winex11.drv: Support reporting emulated display depth.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: a92ab08688b1e425c887ccb77196bbf681f24be1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a92ab08688b1e425c887ccb7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 17 15:20:33 2021 +0800 winex11.drv: Support reporting emulated display depth. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 6 ++--- dlls/user32/tests/monitor.c | 3 --- dlls/winex11.drv/settings.c | 64 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index d854ebcc56d..f1d48639c14 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -4061,7 +4061,7 @@ static void test_create_device_from_clipper1(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); - todo_wine ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", + ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", surface_desc.ddpfPixelFormat.dwRGBBitCount); hr = IDirectDraw2_RestoreDisplayMode(ddraw); @@ -4240,7 +4240,7 @@ static void test_create_device_from_clipper2(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); - todo_wine ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", + ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", surface_desc.ddpfPixelFormat.dwRGBBitCount); hr = IDirectDraw2_RestoreDisplayMode(ddraw); @@ -4418,7 +4418,7 @@ static void test_create_device_from_clipper3(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); - todo_wine ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", + ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", surface_desc.ddpfPixelFormat.dwRGBBitCount); hr = IDirectDraw2_RestoreDisplayMode(ddraw); diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 4510e15b79b..1daf677a815 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -297,8 +297,6 @@ static void _expect_dm(INT line, const DEVMODEA *expected, const CHAR *device, D 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->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, @@ -696,7 +694,6 @@ static void test_ChangeDisplaySettingsEx(void) dm.dmSize = sizeof(dm); res = EnumDisplaySettingsA(devices[device].name, ENUM_CURRENT_SETTINGS, &dm); ok(res, "Device %s EnumDisplaySettingsA failed, error %#x.\n", devices[device].name, GetLastError()); - todo_wine_if(depths[test] != 32) ok(dm.dmBitsPerPel == depths[test], "Device %s expect dmBitsPerPel %u, got %u.\n", devices[device].name, depths[test], dm.dmBitsPerPel); /* 2008 resets to the resolution in the registry. Newer versions of Windows doesn't diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 9a43231f34d..cea7ebbc6b7 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -45,6 +45,16 @@ struct x11drv_display_setting DEVMODEW desired_mode; }; +struct x11drv_display_depth +{ + struct list entry; + ULONG_PTR display_id; + DWORD depth; +}; + +/* Display device emulated depth list, protected by modes_section */ +static struct list x11drv_display_depth_list = LIST_INIT(x11drv_display_depth_list); + /* All Windows drivers seen so far either support 32 bit depths, or 24 bit depths, but never both. So if we have * a 32 bit framebuffer, report 32 bit bpps, otherwise 24 bit ones. */ @@ -405,6 +415,54 @@ static int mode_compare(const void *p1, const void *p2) return a->u1.s2.dmDisplayOrientation - b->u1.s2.dmDisplayOrientation; } +static void set_display_depth(ULONG_PTR display_id, DWORD depth) +{ + struct x11drv_display_depth *display_depth; + + EnterCriticalSection(&modes_section); + LIST_FOR_EACH_ENTRY(display_depth, &x11drv_display_depth_list, struct x11drv_display_depth, entry) + { + if (display_depth->display_id == display_id) + { + display_depth->depth = depth; + LeaveCriticalSection(&modes_section); + return; + } + } + + display_depth = heap_alloc(sizeof(*display_depth)); + if (!display_depth) + { + ERR("Failed to allocate memory.\n"); + LeaveCriticalSection(&modes_section); + return; + } + + display_depth->display_id = display_id; + display_depth->depth = depth; + list_add_head(&x11drv_display_depth_list, &display_depth->entry); + LeaveCriticalSection(&modes_section); +} + +static DWORD get_display_depth(ULONG_PTR display_id) +{ + struct x11drv_display_depth *display_depth; + DWORD depth; + + EnterCriticalSection(&modes_section); + LIST_FOR_EACH_ENTRY(display_depth, &x11drv_display_depth_list, struct x11drv_display_depth, entry) + { + if (display_depth->display_id == display_id) + { + depth = display_depth->depth; + LeaveCriticalSection(&modes_section); + return depth; + } + } + LeaveCriticalSection(&modes_section); + return screen_bpp; +} + /*********************************************************************** * EnumDisplaySettingsEx (X11DRV.@) * @@ -434,6 +492,10 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo ERR("Failed to get %s current display settings.\n", wine_dbgstr_w(name)); return FALSE; } + + if (!is_detached_mode(devmode)) + devmode->dmBitsPerPel = get_display_depth(id); + goto done; } @@ -842,6 +904,8 @@ 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 && ret == DISP_CHANGE_SUCCESSFUL) + set_display_depth(displays[display_idx].id, full_mode->dmBitsPerPel); free_full_mode(full_mode); if (ret != DISP_CHANGE_SUCCESSFUL) return ret;

1 0

Zhiyi Zhang : user32/tests: Add display DC color depth tests.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: c5ed4893b3b6f8be71126e231744dae4743d89f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5ed4893b3b6f8be71126e23… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 17 15:20:42 2021 +0800 user32/tests: Add display DC color depth tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 94 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 92 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 1daf677a815..ab03837f5e6 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -68,6 +68,11 @@ static void flush_events(void) } } +static int get_bitmap_stride(int width, int bpp) +{ + return ((width * bpp + 15) >> 3) & ~1; +} + static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPARAM lparam) { @@ -2030,7 +2035,10 @@ static void test_handles(void) #define check_display_dc(a, b, c) _check_display_dc(__LINE__, a, b, c) static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_todo) { + BITMAP bitmap; + HBITMAP hbmp; INT value; + BOOL ret; value = GetDeviceCaps(hdc, HORZRES); todo_wine_if(allow_todo && dm->dmPelsWidth != GetSystemMetrics(SM_CXSCREEN)) @@ -2058,6 +2066,35 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ todo_wine_if(allow_todo) ok_(__FILE__, line)(value == dm->dmDisplayFrequency, "Expected VREFRESH %d, got %d.\n", dm->dmDisplayFrequency, value); + + value = GetDeviceCaps(hdc, BITSPIXEL); + todo_wine_if(dm->dmBitsPerPel != 32) + ok_(__FILE__, line)(value == dm->dmBitsPerPel, "Expected BITSPIXEL %d, got %d.\n", + dm->dmBitsPerPel, value); + + hbmp = GetCurrentObject(hdc, OBJ_BITMAP); + ok_(__FILE__, line)(!!hbmp, "GetCurrentObject failed, error %#x.\n", GetLastError()); + ret = GetObjectA(hbmp, sizeof(bitmap), &bitmap); + /* GetObjectA fails on Win7 and older */ + ok_(__FILE__, line)(ret || broken(!ret), "GetObjectA failed, error %d.\n", GetLastError()); + if (ret) + { + ok_(__FILE__, line)(bitmap.bmType == 0, "Expected bmType %d, got %d.\n", 0, bitmap.bmType); + todo_wine + ok_(__FILE__, line)(bitmap.bmWidth == GetSystemMetrics(SM_CXVIRTUALSCREEN), + "Expected bmWidth %d, got %d.\n", GetSystemMetrics(SM_CXVIRTUALSCREEN), bitmap.bmWidth); + todo_wine + ok_(__FILE__, line)(bitmap.bmHeight == GetSystemMetrics(SM_CYVIRTUALSCREEN), + "Expected bmHeight %d, got %d.\n", GetSystemMetrics(SM_CYVIRTUALSCREEN), bitmap.bmHeight); + todo_wine + ok_(__FILE__, line)(bitmap.bmBitsPixel == 32, "Expected bmBitsPixel %d, got %d.\n", 32, + bitmap.bmBitsPixel); + ok_(__FILE__, line)(bitmap.bmWidthBytes == get_bitmap_stride(bitmap.bmWidth, bitmap.bmBitsPixel), + "Expected bmWidthBytes %d, got %d.\n", get_bitmap_stride(bitmap.bmWidth, bitmap.bmBitsPixel), + bitmap.bmWidthBytes); + ok_(__FILE__, line)(bitmap.bmPlanes == 1, "Expected bmPlanes %d, got %d.\n", 1, bitmap.bmPlanes); + ok_(__FILE__, line)(bitmap.bmBits == NULL, "Expected bmBits %p, got %p.\n", NULL, bitmap.bmBits); + } } static void test_display_dc(void) @@ -2081,7 +2118,7 @@ static void test_display_dc(void) check_display_dc(hdc, &dm, FALSE); - /* Tests after mode changes */ + /* Tests after mode changes to a different resolution */ memset(&dm2, 0, sizeof(dm2)); dm2.dmSize = sizeof(dm2); for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) @@ -2103,6 +2140,33 @@ static void test_display_dc(void) ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d.\n", res); } + /* Tests after mode changes to a different color depth */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) + { + if (dm2.dmBitsPerPel != dm.dmBitsPerPel) + break; + } + if (dm2.dmBitsPerPel && dm2.dmBitsPerPel != dm.dmBitsPerPel) + { + res = ChangeDisplaySettingsExA(NULL, &dm2, NULL, CDS_RESET, NULL); + /* Win8 TestBots */ + ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), + "ChangeDisplaySettingsExA returned unexpected %d.\n", res); + if (res == DISP_CHANGE_SUCCESSFUL) + { + check_display_dc(hdc, &dm2, FALSE); + + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d.\n", res); + } + } + else + { + win_skip("Failed to find a different color depth other than %u.\n", dm.dmBitsPerPel); + } + DeleteDC(hdc); /* Test DCs covering a specific monitor */ @@ -2122,7 +2186,7 @@ static void test_display_dc(void) check_display_dc(hdc, &dm, FALSE); - /* Tests after mode changes */ + /* Tests after mode changes to a different resolution */ memset(&dm2, 0, sizeof(dm2)); dm2.dmSize = sizeof(dm2); for (mode_idx = 0; EnumDisplaySettingsA(dd.DeviceName, mode_idx, &dm2); ++mode_idx) @@ -2145,7 +2209,33 @@ static void test_display_dc(void) check_display_dc(hdc, &dm2, FALSE); + /* Tests after mode changes to a different color depth */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode_idx = 0; EnumDisplaySettingsA(dd.DeviceName, mode_idx, &dm2); ++mode_idx) + { + if (dm2.dmBitsPerPel != dm.dmBitsPerPel) + break; + } + if (dm2.dmBitsPerPel && dm2.dmBitsPerPel != dm.dmBitsPerPel) + { + res = ChangeDisplaySettingsExA(dd.DeviceName, &dm2, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d.\n", res); + + check_display_dc(hdc, &dm2, FALSE); + + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d.\n", res); + } + else + { + win_skip("Failed to find a different color depth other than %u.\n", dm.dmBitsPerPel); + } + /* Tests after monitor detach */ + ret = EnumDisplaySettingsA(dd.DeviceName, ENUM_CURRENT_SETTINGS, &dm2); + ok(ret, "EnumDisplaySettingsA %s failed.\n", dd.DeviceName); + if (!(dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)) { old_count = GetSystemMetrics(SM_CMONITORS);

1 0

Hugh McMaster : reg: Add initial support for the 'copy' command.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: ac32dd8abcdd93f5428ba93c8aff7f0bb5a7c2f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac32dd8abcdd93f5428ba93c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 17 23:41:05 2021 +1000 reg: Add initial support for the 'copy' command. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 41 +++++++++++++++-- po/ast.po | 41 +++++++++++++++-- po/bg.po | 41 +++++++++++++++-- po/ca.po | 41 +++++++++++++++-- po/cs.po | 41 +++++++++++++++-- po/da.po | 41 +++++++++++++++-- po/de.po | 109 +++++++++++++++++++++++++++++++++++++++++++-- po/el.po | 41 +++++++++++++++-- po/en.po | 74 +++++++++++++++++++++++++++++-- po/en_US.po | 74 +++++++++++++++++++++++++++++-- po/eo.po | 41 +++++++++++++++-- po/es.po | 41 +++++++++++++++-- po/fa.po | 41 +++++++++++++++-- po/fi.po | 107 ++++++++++++++++++++++++++++++++++++++++++-- po/fr.po | 41 +++++++++++++++-- po/he.po | 41 +++++++++++++++-- po/hi.po | 41 +++++++++++++++-- po/hr.po | 41 +++++++++++++++-- po/hu.po | 41 +++++++++++++++-- po/it.po | 41 +++++++++++++++-- po/ja.po | 104 +++++++++++++++++++++++++++++++++++++++++-- po/ko.po | 41 +++++++++++++++-- po/lt.po | 109 +++++++++++++++++++++++++++++++++++++++++++-- po/ml.po | 41 +++++++++++++++-- po/nb_NO.po | 41 +++++++++++++++-- po/nl.po | 110 ++++++++++++++++++++++++++++++++++++++++++++-- po/or.po | 41 +++++++++++++++-- po/pa.po | 41 +++++++++++++++-- po/pl.po | 110 ++++++++++++++++++++++++++++++++++++++++++++-- po/pt_BR.po | 41 +++++++++++++++-- po/pt_PT.po | 41 +++++++++++++++-- po/rm.po | 41 +++++++++++++++-- po/ro.po | 41 +++++++++++++++-- po/ru.po | 41 +++++++++++++++-- po/si.po | 41 +++++++++++++++-- po/sk.po | 41 +++++++++++++++-- po/sl.po | 41 +++++++++++++++-- po/sr_RS(a)cyrillic.po | 41 +++++++++++++++-- po/sr_RS(a)latin.po | 41 +++++++++++++++-- po/sv.po | 41 +++++++++++++++-- po/ta.po | 41 +++++++++++++++-- po/te.po | 41 +++++++++++++++-- po/th.po | 41 +++++++++++++++-- po/tr.po | 41 +++++++++++++++-- po/uk.po | 41 +++++++++++++++-- po/wa.po | 41 +++++++++++++++-- po/wine.pot | 41 +++++++++++++++-- po/zh_CN.po | 41 +++++++++++++++-- po/zh_TW.po | 41 +++++++++++++++-- programs/reg/Makefile.in | 1 + programs/reg/copy.c | 24 ++++++++++ programs/reg/reg.c | 6 +++ programs/reg/reg.h | 3 ++ programs/reg/reg.rc | 24 +++++++++- programs/reg/resource.h | 1 + programs/reg/tests/copy.c | 14 +++--- 56 files changed, 2394 insertions(+), 157 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ac32dd8abcdd93f5428b…

1 0

Hugh McMaster : reg: Fix a typo in a function definition.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: 537cd26f7cf799bf51875d1bc4970ec79a1184a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=537cd26f7cf799bf51875d1b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 17 23:41:04 2021 +1000 reg: Fix a typo in a function definition. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 3fc9e392d45..b12d936d672 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -45,7 +45,7 @@ BOOL is_char(const WCHAR s, const WCHAR c); BOOL is_switch(const WCHAR *s, const WCHAR c); /* add.c */ -int reg_add(int arc, WCHAR *argvW[]); +int reg_add(int argc, WCHAR *argvW[]); /* delete.c */ int reg_delete(int argc, WCHAR *argvW[]);

1 0

Hugh McMaster : reg/tests: Add key and value order tests for the 'copy' command.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: ca57a86074e6109fcc2254e3d58ff225f4335236 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca57a86074e6109fcc2254e3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 17 23:41:03 2021 +1000 reg/tests: Add key and value order tests for the 'copy' command. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/copy.c | 52 +++++++++++++++++++++++++++++++++++++++++++ programs/reg/tests/export.c | 24 ++++++++++---------- programs/reg/tests/reg_test.h | 2 ++ 3 files changed, 66 insertions(+), 12 deletions(-) diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index 3ed75acad4d..53d990811ac 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -325,6 +325,56 @@ static void test_copy_complex_data(void) todo_wine ok(compare_export("file.reg", complex_data_test, 0), "compare_export() failed\n"); } +static void test_copy_key_order(void) +{ + HKEY hkey; + DWORD r; + + delete_tree(HKEY_CURRENT_USER, COPY_SRC); + verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC); + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + + add_key(HKEY_CURRENT_USER, COPY_SRC, &hkey); + add_key(hkey, "Subkey2", NULL); + add_key(hkey, "Subkey1", NULL); + close_key(hkey); + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE " /s /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", key_order_test, 0), "compare_export() failed\n"); +} + +static void test_copy_value_order(void) +{ + HKEY hkey; + DWORD r; + + delete_tree(HKEY_CURRENT_USER, COPY_SRC); + verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC); + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + + add_key(HKEY_CURRENT_USER, COPY_SRC, &hkey); + add_value(hkey, "Value 2", REG_SZ, "I was added first!", 19); + add_value(hkey, "Value 1", REG_SZ, "I was added second!", 20); + close_key(hkey); + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE " /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", value_order_test, 0), "compare_export() failed\n"); +} + static void test_copy_hex_data(void) { HKEY hkey; @@ -498,6 +548,8 @@ START_TEST(copy) test_copy_empty_key(); test_copy_simple_data(); test_copy_complex_data(); + test_copy_key_order(); + test_copy_value_order(); test_copy_hex_data(); test_copy_embedded_null_values(); test_copy_slashes(); diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index be1d9ea4f86..1348b8eebdb 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -99,6 +99,18 @@ const char *complex_data_test = "@=dword:12345678\r\n" "\"43981\"=hex(abcd):56,61,6c,75,65,00\r\n\r\n"; +const char *key_order_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1]\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2]\r\n\r\n"; + +const char *value_order_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"Value 2\"=\"I was added first!\"\r\n" + "\"Value 1\"=\"I was added second!\"\r\n\r\n"; + const char *empty_hex_test = "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" @@ -164,18 +176,6 @@ static void test_export(void) HKEY hkey, subkey; BYTE hex[4], buffer[8]; - const char *key_order_test = - "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n\r\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1]\r\n\r\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2]\r\n\r\n"; - - const char *value_order_test = - "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" - "\"Value 2\"=\"I was added first!\"\r\n" - "\"Value 1\"=\"I was added second!\"\r\n\r\n"; - delete_tree(HKEY_CURRENT_USER, KEY_BASE); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h index 14636b4edc9..28e2d8e3abe 100644 --- a/programs/reg/tests/reg_test.h +++ b/programs/reg/tests/reg_test.h @@ -81,6 +81,8 @@ BOOL compare_export_(const char *file, unsigned line, const char *filename, extern const char *empty_key_test; extern const char *simple_data_test; extern const char *complex_data_test; +extern const char *key_order_test; +extern const char *value_order_test; extern const char *empty_hex_test; extern const char *empty_hex_test2; extern const char *hex_types_test;

1 0

Piotr Caban : msvcrt: Import trunc implementation from musl.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: f2c18726605315a93f733b583a61fb5417f4dde0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2c18726605315a93f733b58… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 17 15:38:22 2021 +0200 msvcrt: Import trunc implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +-- configure.ac | 3 +-- dlls/msvcrt/math.c | 16 +++++++++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 17 insertions(+), 22 deletions(-) diff --git a/configure b/configure index fe54e30321f..7c2e31de5af 100755 --- a/configure +++ b/configure @@ -19643,8 +19643,7 @@ for ac_func in \ remquo \ remquof \ tgamma \ - tgammaf \ - trunc + tgammaf do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/configure.ac b/configure.ac index fb4ec181ea2..4c98c3e5597 100644 --- a/configure.ac +++ b/configure.ac @@ -2683,8 +2683,7 @@ AC_CHECK_FUNCS(\ remquo \ remquof \ tgamma \ - tgammaf \ - trunc + tgammaf ) LIBS="$ac_save_LIBS" diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 246f329ee95..f2caa81712b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4981,10 +4981,24 @@ __int64 CDECL llroundf(float x) /********************************************************************* * trunc (MSVCR120.@) + * + * Copied from musl: src/math/trunc.c */ double CDECL trunc(double x) { - return unix_funcs->trunc(x); + union {double f; UINT64 i;} u = {x}; + int e = (u.i >> 52 & 0x7ff) - 0x3ff + 12; + UINT64 m; + + if (e >= 52 + 12) + return x; + if (e < 12) + e = 1; + m = -1ULL >> e; + if ((u.i & m) == 0) + return x; + u.i &= ~m; + return u.f; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index e809d7353ff..d7e368d1b37 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -636,18 +636,6 @@ static double CDECL unix_tgamma(double x) #endif } -/********************************************************************* - * trunc - */ -static double CDECL unix_trunc(double x) -{ -#ifdef HAVE_TRUNC - return trunc(x); -#else - return (x > 0) ? floor(x) : ceil(x); -#endif -} - /********************************************************************* * tgammaf */ @@ -722,7 +710,6 @@ static const struct unix_funcs funcs = unix_tanhf, unix_tgamma, unix_tgammaf, - unix_trunc, }; NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index fd279cf5519..b8c18b1e2a5 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -82,7 +82,6 @@ struct unix_funcs float (CDECL *tanhf)(float x); double (CDECL *tgamma)(double x); float (CDECL *tgammaf)(float x); - double (CDECL *trunc)(double x); }; #endif /* __UNIXLIB_H */ diff --git a/include/config.h.in b/include/config.h.in index 7fe9383a778..bf7fc0d4e9b 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1010,9 +1010,6 @@ /* Define to 1 if you have the <tiffio.h> header file. */ #undef HAVE_TIFFIO_H -/* Define to 1 if you have the `trunc' function. */ -#undef HAVE_TRUNC - /* Define to 1 if you have the `udev' library (-ludev). */ #undef HAVE_UDEV

1 0

Piotr Caban : msvcrt: Import truncf implementation from musl.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: 5544e6de07392395b907333afd8b0e71e1a166aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=5544e6de07392395b907333a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 17 15:38:18 2021 +0200 msvcrt: Import truncf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +-- configure.ac | 3 +-- dlls/msvcrt/math.c | 16 +++++++++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 17 insertions(+), 22 deletions(-) diff --git a/configure b/configure index 69b97958832..fe54e30321f 100755 --- a/configure +++ b/configure @@ -19644,8 +19644,7 @@ for ac_func in \ remquof \ tgamma \ tgammaf \ - trunc \ - truncf + trunc do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/configure.ac b/configure.ac index 7fde36f7616..fb4ec181ea2 100644 --- a/configure.ac +++ b/configure.ac @@ -2684,8 +2684,7 @@ AC_CHECK_FUNCS(\ remquof \ tgamma \ tgammaf \ - trunc \ - truncf + trunc ) LIBS="$ac_save_LIBS" diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 5682b00bb66..246f329ee95 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4989,10 +4989,24 @@ double CDECL trunc(double x) /********************************************************************* * truncf (MSVCR120.@) + * + * Copied from musl: src/math/truncf.c */ float CDECL truncf(float x) { - return unix_funcs->truncf(x); + union {float f; UINT32 i;} u = {x}; + int e = (u.i >> 23 & 0xff) - 0x7f + 9; + UINT32 m; + + if (e >= 23 + 9) + return x; + if (e < 9) + e = 1; + m = -1U >> e; + if ((u.i & m) == 0) + return x; + u.i &= ~m; + return u.f; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 83a1e5386c1..e809d7353ff 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -648,18 +648,6 @@ static double CDECL unix_trunc(double x) #endif } -/********************************************************************* - * truncf - */ -static float CDECL unix_truncf(float x) -{ -#ifdef HAVE_TRUNCF - return truncf(x); -#else - return unix_trunc(x); -#endif -} - /********************************************************************* * tgammaf */ @@ -735,7 +723,6 @@ static const struct unix_funcs funcs = unix_tgamma, unix_tgammaf, unix_trunc, - unix_truncf }; NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index a86e2d34852..fd279cf5519 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -83,7 +83,6 @@ struct unix_funcs double (CDECL *tgamma)(double x); float (CDECL *tgammaf)(float x); double (CDECL *trunc)(double x); - float (CDECL *truncf)(float x); }; #endif /* __UNIXLIB_H */ diff --git a/include/config.h.in b/include/config.h.in index ce83ecacd8e..7fe9383a778 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1013,9 +1013,6 @@ /* Define to 1 if you have the `trunc' function. */ #undef HAVE_TRUNC -/* Define to 1 if you have the `truncf' function. */ -#undef HAVE_TRUNCF - /* Define to 1 if you have the `udev' library (-ludev). */ #undef HAVE_UDEV

1 0

Piotr Caban : msvcrt: Import floor implementation from musl.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: 29c07324c19bbdaf5255b230cca5e0db5c5796c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29c07324c19bbdaf5255b230… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 17 15:38:15 2021 +0200 msvcrt: Import floor implementation from musl. The implementation is based on floorf. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 23 ++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d85b43c7d7f..5682b00bb66 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1811,10 +1811,31 @@ double CDECL ceil( double x ) /********************************************************************* * floor (MSVCRT.@) + * + * Based on musl: src/math/floorf.c */ double CDECL floor( double x ) { - return unix_funcs->floor(x); + union {double f; UINT64 i;} u = {x}; + int e = (int)(u.i >> 52 & 0x7ff) - 0x3ff; + UINT64 m; + + if (e >= 52) + return x; + if (e >= 0) { + m = 0x000fffffffffffffULL >> e; + if ((u.i & m) == 0) + return x; + if (u.i >> 63) + u.i += m; + u.i &= ~m; + } else { + if (u.i >> 63 == 0) + return 0; + else if (u.i << 1) + return -1; + } + return u.f; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 9cdcd14e986..83a1e5386c1 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -273,14 +273,6 @@ static float CDECL unix_expm1f(float x) #endif } -/********************************************************************* - * floor - */ -static double CDECL unix_floor( double x ) -{ - return floor( x ); -} - /********************************************************************* * fma */ @@ -703,7 +695,6 @@ static const struct unix_funcs funcs = unix_exp2f, unix_expm1, unix_expm1f, - unix_floor, unix_fma, unix_fmaf, unix_fmod, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 47af0e464cd..a86e2d34852 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -43,7 +43,6 @@ struct unix_funcs float (CDECL *exp2f)(float x); double (CDECL *expm1)(double x); float (CDECL *expm1f)(float x); - double (CDECL *floor)(double x); double (CDECL *fma)(double x, double y, double z); float (CDECL *fmaf)(float x, float y, float z); double (CDECL *fmod)(double x, double y);

1 0

Piotr Caban : msvcrt: Import ceilf implementation from musl.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: bba43bd6dad0dd96ec547a6630cd34a4c80887df URL: https://source.winehq.org/git/wine.git/?a=commit;h=bba43bd6dad0dd96ec547a66… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 17 15:38:08 2021 +0200 msvcrt: Import ceilf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 23 ++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index a4dd61f881c..5502e2934e9 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -798,10 +798,31 @@ float CDECL tanhf( float x ) /********************************************************************* * ceilf (MSVCRT.@) + * + * Copied from musl: src/math/ceilf.c */ float CDECL ceilf( float x ) { - return unix_funcs->ceilf(x); + union {float f; UINT32 i;} u = {x}; + int e = (int)(u.i >> 23 & 0xff) - 0x7f; + UINT32 m; + + if (e >= 23) + return x; + if (e >= 0) { + m = 0x007fffff >> e; + if ((u.i & m) == 0) + return x; + if (u.i >> 31 == 0) + u.i += m; + u.i &= ~m; + } else { + if (u.i >> 31) + return -0.0; + else if (u.i << 1) + return 1.0; + } + return u.f; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 9d9f86b7358..634ab6f1a4b 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -121,14 +121,6 @@ static float CDECL unix_atanhf(float x) #endif } -/********************************************************************* - * ceilf - */ -static float CDECL unix_ceilf( float x ) -{ - return ceilf( x ); -} - /********************************************************************* * cos */ @@ -705,7 +697,6 @@ static const struct unix_funcs funcs = unix_asinhf, unix_atanh, unix_atanhf, - unix_ceilf, unix_cos, unix_cosf, unix_cosh, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 70d955d5e4f..472eb323850 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -29,7 +29,6 @@ struct unix_funcs float (CDECL *asinhf)(float x); double (CDECL *atanh)(double x); float (CDECL *atanhf)(float x); - float (CDECL *ceilf)(float x); double (CDECL *cos)(double x); float (CDECL *cosf)(float x); double (CDECL *cosh)(double x);

1 0

Zebediah Figura : include: Print context information after the message type.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: 19c9969c79b1b36ec3bada9dda6fa44df17a9482 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19c9969c79b1b36ec3bada9d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 17 13:04:40 2021 +0200 include: Print context information after the message type. This makes identifying the failures and other message types easier and more reliable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index f2aacaff592..8073071d262 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -300,26 +300,26 @@ const char *winetest_elapsed(void) return wine_dbg_sprintf( "%.3f", (now - winetest_start_time) / 1000.0); } -static void winetest_vprintf( const char *msg, __winetest_va_list args ) -{ - struct tls_data *data = get_tls_data(); - unsigned int i; - - printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed() ); - for (i = 0; i < data->context_count; ++i) - printf( "%s: ", data->context[i] ); - vprintf( msg, args ); -} - static void __winetest_cdecl winetest_printf( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); static void __winetest_cdecl winetest_printf( const char *msg, ... ) { + struct tls_data *data = get_tls_data(); __winetest_va_list valist; + printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed() ); __winetest_va_start( valist, msg ); - winetest_vprintf( msg, valist ); + vprintf( msg, valist ); __winetest_va_end( valist ); } +static void __winetest_cdecl winetest_print_context( const char *msgtype ) +{ + struct tls_data *data = get_tls_data(); + unsigned int i; + + winetest_printf( "%s", msgtype ); + for (i = 0; i < data->context_count; ++i) + printf( "%s: ", data->context[i] ); +} void winetest_subtest( const char* name ) { @@ -371,7 +371,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (condition) { - winetest_printf( "Test succeeded inside todo block: " ); + winetest_print_context( "Test succeeded inside todo block: " ); vprintf(msg, args); InterlockedIncrement(&todo_failures); return 0; @@ -383,7 +383,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (winetest_debug > 0) { - winetest_printf( "Test marked todo: " ); + winetest_print_context( "Test marked todo: " ); vprintf(msg, args); } InterlockedIncrement(&todo_successes); @@ -397,7 +397,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (!condition) { - winetest_printf( "Test failed: " ); + winetest_print_context( "Test failed: " ); vprintf(msg, args); InterlockedIncrement(&failures); return 0; @@ -407,7 +407,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) if (winetest_report_success || (winetest_time && GetTickCount() >= winetest_last_time + 1000)) { - winetest_printf( "Test succeeded\n" ); + winetest_printf("Test succeeded\n"); } InterlockedIncrement(&successes); return 1; @@ -432,8 +432,9 @@ void __winetest_cdecl winetest_trace( const char *msg, ... ) return; if (winetest_add_line() < winetest_mute_threshold) { + winetest_print_context( "" ); __winetest_va_start(valist, msg); - winetest_vprintf( msg, valist ); + vprintf( msg, valist ); __winetest_va_end(valist); } else @@ -444,7 +445,7 @@ void winetest_vskip( const char *msg, __winetest_va_list args ) { if (winetest_add_line() < winetest_mute_threshold) { - winetest_printf( "Tests skipped: " ); + winetest_print_context( "Tests skipped: " ); vprintf(msg, args); InterlockedIncrement(&skipped); }

1 0