January 2020 - Wine-commits

Alexandre Julliard : Wine release 5.0-rc5
by Alexandre Julliard 11 Jan '20

11 Jan '20

Module: website Branch: master Commit: 12b6b506b96f5bd0fb9c89549818238186372993 URL: https://source.winehq.org/git/website.git/?a=commit;h=12b6b506b96f5bd0fb9c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 11 01:28:18 2020 +0100 Wine release 5.0-rc5 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020011101.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2020011101.xml b/news/en/2020011101.xml new file mode 100644 index 00000000..7ed7a36b --- /dev/null +++ b/news/en/2020011101.xml @@ -0,0 +1,12 @@ +<news> +<date>January 11, 2020</date> +<title>Wine 5.0-rc5 Released</title> +<body> + The Wine development release 5.0-rc5 is now available. + <a href="{$root}/announce/5.0-rc5">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.0/wine-5.0-rc5.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Matteo Bruni : ucrtbase: Export _o_to{lower, upper}() as to{lower, upper}().
by Alexandre Julliard 11 Jan '20

11 Jan '20

Module: wine Branch: master Commit: 4688a57fd35b719f1e330b3e722f52348a9a5e34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4688a57fd35b719f1e330b3e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 9 23:03:15 2020 +0100 ucrtbase: Export _o_to{lower, upper}() as to{lower, upper}(). As opposed to _to{lower,upper}() i.e. the broken-by-design version. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index a262cc6345..8987134d97 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1806,8 +1806,8 @@ @ stub _o_tgammal @ stub _o_tmpfile_s @ stub _o_tmpnam_s -@ cdecl _o_tolower(long) MSVCRT__tolower -@ cdecl _o_toupper(long) MSVCRT__toupper +@ cdecl _o_tolower(long) MSVCRT_tolower +@ cdecl _o_toupper(long) MSVCRT_toupper @ stub _o_towlower @ stub _o_towupper @ stub _o_ungetc

1 0

Matteo Bruni : ucrtbase/tests: Add tests for the various tolower() and toupper() variants.
by Alexandre Julliard 11 Jan '20

11 Jan '20

Module: wine Branch: master Commit: 904a238ba079cf0dfabd61604bd9eafbf7e0e71e URL: https://source.winehq.org/git/wine.git/?a=commit;h=904a238ba079cf0dfabd6160… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 9 23:03:17 2020 +0100 ucrtbase/tests: Add tests for the various tolower() and toupper() variants. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/string.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index c18b5483aa..7a2cf06a90 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -73,8 +73,14 @@ static double (__cdecl *p_strtod)(const char*, char** end); static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t,_locale_t); static size_t (__cdecl *p___strncnt)(const char*, size_t); +static int (__cdecl *p_tolower)(int); +static int (__cdecl *p__tolower)(int); +static int (__cdecl *p__o_tolower)(int); static int (__cdecl *p_towlower)(wint_t); static int (__cdecl *p__towlower_l)(wint_t, _locale_t); +static int (__cdecl *p_toupper)(int); +static int (__cdecl *p__toupper)(int); +static int (__cdecl *p__o_toupper)(int); static int (__cdecl *p_towupper)(wint_t); static int (__cdecl *p__towupper_l)(wint_t, _locale_t); static char* (__cdecl *p_setlocale)(int, const char*); @@ -100,8 +106,14 @@ static BOOL init(void) p__memicmp = (void*)GetProcAddress(module, "_memicmp"); p__memicmp_l = (void*)GetProcAddress(module, "_memicmp_l"); p___strncnt = (void*)GetProcAddress(module, "__strncnt"); + p_tolower = (void*)GetProcAddress(module, "tolower"); + p__tolower = (void*)GetProcAddress(module, "_tolower"); + p__o_tolower = (void*)GetProcAddress(module, "_o_tolower"); p_towlower = (void*)GetProcAddress(module, "towlower"); p__towlower_l = (void*)GetProcAddress(module, "_towlower_l"); + p_toupper = (void*)GetProcAddress(module, "toupper"); + p__toupper = (void*)GetProcAddress(module, "_toupper"); + p__o_toupper = (void*)GetProcAddress(module, "_o_toupper"); p_towupper = (void*)GetProcAddress(module, "towupper"); p__towupper_l = (void*)GetProcAddress(module, "_towupper_l"); p_setlocale = (void*)GetProcAddress(module, "setlocale"); @@ -320,6 +332,28 @@ static void test_C_locale(void) p_setlocale(LC_ALL, "C"); for (i = 0; i <= 0xffff; i++) { + ret = p_tolower(i); + if (i >= 'A' && i <= 'Z') + { + exp = i + 'a' - 'A'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + ok(ret == i, "expected self %x, got %x for C locale\n", i, ret); + + ret = p__tolower(i); + exp = i + 'a' - 'A'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + + ret = p__o_tolower(i); + if (i >= 'A' && i <= 'Z') + { + exp = i + 'a' - 'A'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + ok(ret == i, "expected self %x, got %x for C locale\n", i, ret); + ret = p_towlower(i); if (i >= 'A' && i <= 'Z') { @@ -329,6 +363,28 @@ static void test_C_locale(void) else ok(ret == i, "expected self %x, got %x for C locale\n", i, ret); + ret = p_toupper(i); + if (i >= 'a' && i <= 'z') + { + exp = i + 'A' - 'a'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + ok(ret == i, "expected self %x, got %x for C locale\n", i, ret); + + ret = p__toupper(i); + exp = i + 'A' - 'a'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + + ret = p__o_toupper(i); + if (i >= 'a' && i <= 'z') + { + exp = i + 'A' - 'a'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + ok(ret == i, "expected self %x, got %x for C locale\n", i, ret); + ret = p_towupper(i); if (i >= 'a' && i <= 'z') {

1 0

Matteo Bruni : ucrtbase: Add _o_fmod() and _o_fmodf().
by Alexandre Julliard 11 Jan '20

11 Jan '20

Module: wine Branch: master Commit: b85f5efa436c70c3f50f1d66d1862d81f701849c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b85f5efa436c70c3f50f1d66… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 10 00:34:22 2020 +0100 ucrtbase: Add _o_fmod() and _o_fmodf(). Together with the previous patch this fixes some crashes reproduced with Heroes of the Storm. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 7e2717c44a..668b8c02fb 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -957,8 +957,8 @@ @ stub _o_fma @ stub _o_fmaf @ stub _o_fmal -@ stub _o_fmod -@ stub _o_fmodf +@ cdecl _o_fmod(double double) ucrtbase._o_fmod +@ cdecl -arch=!i386 _o_fmodf(float float) ucrtbase._o_fmodf @ stub _o_fopen @ stub _o_fopen_s @ stub _o_fputc diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 8987134d97..dc95824a1f 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1621,8 +1621,8 @@ @ stub _o_fma @ stub _o_fmaf @ stub _o_fmal -@ stub _o_fmod -@ stub _o_fmodf +@ cdecl _o_fmod(double double) MSVCRT_fmod +@ cdecl -arch=!i386 _o_fmodf(float float) MSVCRT_fmodf @ stub _o_fopen @ stub _o_fopen_s @ stub _o_fputc

1 0

Nikolay Sivov : user32/tests: Use device context layout functions directly.
by Alexandre Julliard 11 Jan '20

11 Jan '20

Module: wine Branch: master Commit: d0cd105d5987b5e3ca97b3200f4ef23fd5b4f124 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0cd105d5987b5e3ca97b320… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 10 08:32:22 2020 +0300 user32/tests: Use device context layout functions directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dce.c | 37 ++++++--------- dlls/user32/tests/win.c | 117 +++++++++++++++++++++++------------------------- 2 files changed, 68 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d0cd105d5987b5e3ca97…

1 0

Nikolay Sivov : advapi32/tests: Use CreateWellKnownSid() directly.
by Alexandre Julliard 11 Jan '20

11 Jan '20

Module: wine Branch: master Commit: a7e1e4f72edb9f96737d924933487ad3c583a7d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7e1e4f72edb9f96737d9249… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 10 08:36:27 2020 +0300 advapi32/tests: Use CreateWellKnownSid() directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 211 +++++++++++++++++------------------------ 1 file changed, 88 insertions(+), 123 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a7e1e4f72edb9f96737d…

1 0

Nikolay Sivov : advapi32/tests: Remove some workarounds in Crypt* tests.
by Alexandre Julliard 11 Jan '20

11 Jan '20

Module: wine Branch: master Commit: 970d8d5d09a575c203a92f791376d519471bfc38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=970d8d5d09a575c203a92f79… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 10 08:36:28 2020 +0300 advapi32/tests: Remove some workarounds in Crypt* tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/crypt.c | 318 ++++++++++++++++++-------------------------- 1 file changed, 133 insertions(+), 185 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=970d8d5d09a575c203a9…

1 0

Alexandre Julliard : Release 5.0-rc5.
by Alexandre Julliard 11 Jan '20

11 Jan '20

Module: wine Branch: master Commit: c84fa0a2661f2235fac6f3427201fbb3fd8c8028 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c84fa0a2661f2235fac6f342… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 11 01:26:25 2020 +0100 Release 5.0-rc5. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 228 +++++++++++++++++++++++++++++++++++++------------------------- VERSION | 2 +- configure | 18 ++--- 3 files changed, 148 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c84fa0a2661f2235fac6…

1 0

Tag wine-5.0-rc5 : Alexandre Julliard : Release 5.0-rc5
by Alexandre Julliard 11 Jan '20

11 Jan '20

Module: wine Branch: refs/tags/wine-5.0-rc5 Tag: 7d643126d490315a6dbabc0def9babc237964da1 URL: https://source.winehq.org/git/wine.git/?a=tag;h=7d643126d490315a6dbabc0def9… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 11 01:26:25 2020 +0100 Release 5.0-rc5

1 0

Francois Gouget : testbot/Janitor: Deleting a pending series is not an error.
by Alexandre Julliard 10 Jan '20

10 Jan '20

Module: tools Branch: master Commit: d3cc3d42ae1c91b063867b4a512bf1075d71b1ee URL: https://source.winehq.org/git/tools.git/?a=commit;h=d3cc3d42ae1c91b063867b4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 10 13:13:57 2020 +0100 testbot/Janitor: Deleting a pending series is not an error. Maybe the author abandonned it or some email server dropped some part. So just trace the deletion and the pending parts so we know which were missing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 9ee5517..4eda071 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -148,9 +148,10 @@ my $DeleteBefore = time() - 1 * 86400; my $Sets = CreatePendingPatchSets(); foreach my $Set (@{$Sets->GetItems()}) { - my $MostRecentPatch; + my ($MostRecentPatch, @Parts); foreach my $Part (@{$Set->Parts->GetItems()}) { + push @Parts, $Part->No; my $Patch = $Part->Patch; if (! defined($MostRecentPatch) || $MostRecentPatch->Received < $Patch->Received) @@ -161,7 +162,7 @@ foreach my $Set (@{$Sets->GetItems()}) if (! defined($MostRecentPatch) || $MostRecentPatch->Received < $DeleteBefore) { - Error "Deleting pending series for ", $Set->EMail, "\n"; + Trace "Deleting pending series for ", $Set->EMail, " (got ", join(" ", sort @Parts), " / ", $Set->TotalParts, ")\n"; next if ($DryRun); $Sets->DeleteItem($Set);

1 0