wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Francois Gouget : advapi32/tests: Time zones should have both MUI and regular strings.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: ec517d4f07873f6cca7ce3753b4bb32acdbda6f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec517d4f07873f6cca7ce375… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 17 16:53:55 2021 +0200 advapi32/tests: Time zones should have both MUI and regular strings. However a few time zones were missing the MUI display name in some Windows 1809 versions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 65 ++++++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 19 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 66382876fa5..72423eae94c 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -4012,9 +4012,8 @@ static void test_EnumDynamicTimeZoneInformation(void) { LSTATUS status; HKEY key, subkey; - WCHAR name[32]; + WCHAR name[128]; WCHAR keyname[128]; - WCHAR displayname[128]; WCHAR sysdir[MAX_PATH]; DWORD index, ret, gle, size; DYNAMIC_TIME_ZONE_INFORMATION bogus_dtzi, dtzi; @@ -4058,6 +4057,7 @@ static void test_EnumDynamicTimeZoneInformation(void) index = 0; while (!(status = RegEnumKeyW(key, index, keyname, ARRAY_SIZE(keyname)))) { + winetest_push_context("%s" , wine_dbgstr_w(keyname)); subkey = NULL; status = RegOpenKeyExW(key, keyname, 0, KEY_QUERY_VALUE, &subkey); ok(status == ERROR_SUCCESS, "got %d\n", status); @@ -4079,31 +4079,57 @@ static void test_EnumDynamicTimeZoneInformation(void) { size = sizeof(name); memset(name, 0, sizeof(name)); + status = pRegGetValueW(subkey, NULL, L"Std", RRF_RT_REG_SZ, NULL, name, &size); + ok(status == ERROR_SUCCESS, "status %d Std %s\n", status, + wine_dbgstr_w(name)); + ok(*name, "Std name is empty\n"); if (pRegLoadMUIStringW) + { + size = sizeof(name); + memset(name, 0, sizeof(name)); status = pRegLoadMUIStringW(subkey, L"MUI_Std", name, size, &size, 0, sysdir); - else - status = pRegGetValueW(subkey, NULL, L"Std", RRF_RT_REG_SZ, NULL, name, &size); - ok(status == ERROR_SUCCESS, "status %d name %s\n", status, wine_dbgstr_w(name)); - ok(!memcmp(&dtzi.StandardName, name, size), - "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(dtzi.StandardName)); + ok(status == ERROR_SUCCESS, "status %d MUI_Std %s\n", + status, wine_dbgstr_w(name)); + ok(*name, "MUI_Std name is empty\n"); + } + ok(!memcmp(&dtzi.StandardName, name, size), "expected %s, got %s\n", + wine_dbgstr_w(name), wine_dbgstr_w(dtzi.StandardName)); size = sizeof(name); memset(name, 0, sizeof(name)); + status = pRegGetValueW(subkey, NULL, L"Dlt", RRF_RT_REG_SZ, NULL, name, &size); + ok(status == ERROR_SUCCESS, "status %d %s Dlt %s\n", + status, wine_dbgstr_w(keyname), wine_dbgstr_w(name)); + ok(*name, "Dlt name is empty\n"); if (pRegLoadMUIStringW) + { + size = sizeof(name); + memset(name, 0, sizeof(name)); status = pRegLoadMUIStringW(subkey, L"MUI_Dlt", name, size, &size, 0, sysdir); - else - status = pRegGetValueW(subkey, NULL, L"Dlt", RRF_RT_REG_SZ, NULL, name, &size); - ok(status == ERROR_SUCCESS, "status %d name %s\n", status, wine_dbgstr_w(name)); - ok(!memcmp(&dtzi.DaylightName, name, size), - "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(dtzi.DaylightName)); - - size = sizeof(displayname); - memset(displayname, 0, sizeof(displayname)); + ok(status == ERROR_SUCCESS, "status %d %s MUI_Dlt %s\n", + status, wine_dbgstr_w(keyname), wine_dbgstr_w(name)); + ok(*name, "MUI_Dlt name is empty\n"); + } + ok(!memcmp(&dtzi.DaylightName, name, size), "expected %s, got %s\n", + wine_dbgstr_w(name), wine_dbgstr_w(dtzi.DaylightName)); + + size = sizeof(name); + memset(name, 0, sizeof(name)); + status = pRegGetValueW(subkey, NULL, L"Display", RRF_RT_REG_SZ, NULL, name, &size); + ok(status == ERROR_SUCCESS, "status %d %s Display %s\n", + status, wine_dbgstr_w(keyname), wine_dbgstr_w(name)); + ok(*name, "Display name is empty\n"); if (pRegLoadMUIStringW) - status = pRegLoadMUIStringW(subkey, L"MUI_Display", displayname, size, &size, 0, sysdir); - else - status = pRegGetValueW(subkey, NULL, L"Display", RRF_RT_REG_SZ, NULL, displayname, &size); - todo_wine ok(status == ERROR_SUCCESS, "status %d displayname %s\n", status, wine_dbgstr_w(displayname)); + { + size = sizeof(name); + memset(name, 0, sizeof(name)); + status = pRegLoadMUIStringW(subkey, L"MUI_Display", name, size, &size, 0, sysdir); + /* recently added time zones may not have MUI strings */ + todo_wine ok((status == ERROR_SUCCESS && *name) || + broken(status == ERROR_RESOURCE_TYPE_NOT_FOUND) /* Win10 1809 32-bit */ || + broken(status == ERROR_MUI_FILE_NOT_FOUND) /* Win10 1809 64-bit */, + "status %d MUI_Display %s\n", status, wine_dbgstr_w(name)); + } } else { @@ -4132,6 +4158,7 @@ static void test_EnumDynamicTimeZoneInformation(void) "expected %s, got %s\n", dbgstr_SYSTEMTIME(&tz_data.dlt_date), dbgstr_SYSTEMTIME(&dtzi.DaylightDate)); + winetest_pop_context(); RegCloseKey(subkey); index++; }

1 0

Hugh McMaster : reg: Fail if one or more arguments follow a help switch.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 6c466296a7629487930d4d6e4fa7d7ae66a7bf61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c466296a7629487930d4d6e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 17 23:41:06 2021 +1000 reg: Fail if one or more arguments follow a help switch. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 13 ++++++++----- programs/reg/tests/copy.c | 8 ++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 652fb19d931..8d3bf78f0a9 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -349,14 +349,12 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) return 1; } else if (argc == 2) /* Valid operation, no arguments supplied */ - { - output_message(STRING_INVALID_SYNTAX); - output_message(STRING_FUNC_HELP, wcsupr(argvW[1])); - return 1; - } + goto invalid; if (is_help_switch(argvW[2])) { + if (argc > 3) goto invalid; + output_message(op_help); output_message(STRING_REG_VIEW_USAGE); return 0; @@ -378,4 +376,9 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) return reg_import(argc, argvW); return reg_query(argc, argvW); + +invalid: + output_message(STRING_INVALID_SYNTAX); + output_message(STRING_FUNC_HELP, wcsupr(argvW[1])); + return 1; } diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index ecd3cc5b29d..5ddcc2c0ffa 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -37,16 +37,16 @@ static void test_command_syntax(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg copy /? /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg copy /h /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg copy /? /s", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg copy /h /s", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg copy /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);

1 0

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

17 May '21

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 17 May '21

17 May '21

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 17 May '21

17 May '21

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 17 May '21

17 May '21

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 17 May '21

17 May '21

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 17 May '21

17 May '21

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 floorf implementation from musl.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: e5ddf0e8d8d5cf0021a1b210f6902f1285f54378 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5ddf0e8d8d5cf0021a1b210… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 17 15:38:12 2021 +0200 msvcrt: Import floorf 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 5502e2934e9..d85b43c7d7f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -827,10 +827,31 @@ float CDECL ceilf( float x ) /********************************************************************* * floorf (MSVCRT.@) + * + * Copied from musl: src/math/floorf.c */ float CDECL floorf( float x ) { - return unix_funcs->floorf(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) + u.i += m; + u.i &= ~m; + } else { + if (u.i >> 31 == 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 634ab6f1a4b..9cdcd14e986 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -281,14 +281,6 @@ static double CDECL unix_floor( double x ) return floor( x ); } -/********************************************************************* - * floorf - */ -static float CDECL unix_floorf( float x ) -{ - return floorf( x ); -} - /********************************************************************* * fma */ @@ -712,7 +704,6 @@ static const struct unix_funcs funcs = unix_expm1, unix_expm1f, unix_floor, - unix_floorf, unix_fma, unix_fmaf, unix_fmod, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 472eb323850..47af0e464cd 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -44,7 +44,6 @@ struct unix_funcs double (CDECL *expm1)(double x); float (CDECL *expm1f)(float x); double (CDECL *floor)(double x); - float (CDECL *floorf)(float 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 17 May '21

17 May '21

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

← Newer
1
...
36
37
38
39
40
41
42
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2021