January 2020 - Wine-commits

Alexandre Julliard : Release 5.0-rc4.
by Alexandre Julliard 03 Jan '20

03 Jan '20

Module: wine Branch: master Commit: 0747fd29d8f429a3421207b52eabe11cfcdf877d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0747fd29d8f429a3421207b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 3 22:23:33 2020 +0100 Release 5.0-rc4. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 210 ++++++++++++++++++++++++++------------------------------------ VERSION | 2 +- configure | 18 +++--- 3 files changed, 99 insertions(+), 131 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0747fd29d8f429a34212…

1 0

Tag wine-5.0-rc4 : Alexandre Julliard : Release 5.0-rc4
by Alexandre Julliard 03 Jan '20

03 Jan '20

Module: wine Branch: refs/tags/wine-5.0-rc4 Tag: 17ffb257f3d62920c52e5b8cf9abf7f9e548f9a6 URL: https://source.winehq.org/git/wine.git/?a=tag;h=17ffb257f3d62920c52e5b8cf9a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 3 22:23:33 2020 +0100 Release 5.0-rc4

1 0

Francois Gouget : testbot/Janitor: Notify the administrator whenever an error occurs.
by Alexandre Julliard 03 Jan '20

03 Jan '20

Module: tools Branch: master Commit: 42d96d82701972605d39a683086786b1b35be6bb URL: https://source.winehq.org/git/tools.git/?a=commit;h=42d96d82701972605d39a68… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 3 11:32:43 2020 +0100 testbot/Janitor: Notify the administrator whenever an error occurs. Errors are also recorded in the general TestBot log but administrators would normally only read the log when something breaks the TestBot so that they would miss messages about unexpected TestAgentd.exe files for instance. Directly notifying the administrators about such issues makes it more likely that the Janitor script will remain up to date. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 35500e1..9ee5517 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -51,6 +51,7 @@ use WineTestBot::CGI::Sessions; use WineTestBot::RecordGroups; use WineTestBot::Tasks; use WineTestBot::Users; +use WineTestBot::Utils; use WineTestBot::VMs; @@ -65,10 +66,12 @@ sub Trace(@) LogMsg @_; } +my @Errors; sub Error(@) { print STDERR "$Name0:error: ", @_ if (!$LogOnly); LogMsg @_; + push @Errors, "error: ". join("", @_); } @@ -363,3 +366,10 @@ if ($JobPurgeDays != 0) } } } + +if (@Errors) +{ + NotifyAdministrator("Errors occurred during the TestBot cleanup", + "Some errors occurred while cleaning up the TestBot database and directories:\n\n". + join("", @Errors)); +}

1 0

Gabriel Ivăncescu : quartz: Reset the advise thread's timeout on each iteration.
by Alexandre Julliard 02 Jan '20

02 Jan '20

Module: wine Branch: master Commit: 14435a6d31377bb8a5d190a93eb22be66080f9d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14435a6d31377bb8a5d190a9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jan 2 15:07:44 2020 +0200 quartz: Reset the advise thread's timeout on each iteration. Fixes a regression introduced by 63a6b308e91232dd55dd107595a6181c70180dd4. Because the timeout value was always shrinked, it quickly went to 0 and then the entire advise thread used 100% of a CPU core in applications such as Media Player Classic by basically becoming a busy loop. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/systemclock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 77e569d437..8122cc5b0b 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -126,13 +126,14 @@ static DWORD WINAPI SystemClockAdviseThread(void *param) struct system_clock *clock = param; struct advise_sink *sink, *cursor; REFERENCE_TIME current_time; - DWORD timeout = INFINITE; HANDLE handles[2] = {clock->stop_event, clock->notify_event}; TRACE("Starting advise thread for clock %p.\n", clock); for (;;) { + DWORD timeout = INFINITE; + EnterCriticalSection(&clock->cs); current_time = GetTickCount64() * 10000;

1 0

Jacek Caban : kernel32/tests: Get rid of no longer needed win9x checks.
by Alexandre Julliard 02 Jan '20

02 Jan '20

Module: wine Branch: master Commit: 313fc40a97eb82a4164829f3d4539b0121b3bec3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=313fc40a97eb82a4164829f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 2 17:22:51 2020 +0100 kernel32/tests: Get rid of no longer needed win9x checks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/profile.c | 195 ++++++++++++------------------------------ 1 file changed, 57 insertions(+), 138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=313fc40a97eb82a41648…

1 0

Hans Leidekker : qmgr/tests: Fix test failures on Windows XP.
by Alexandre Julliard 02 Jan '20

02 Jan '20

Module: wine Branch: master Commit: e82c5f65b0956ec75fb9464f27bcf9362fef4ed3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e82c5f65b0956ec75fb9464f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 2 16:36:00 2020 +0100 qmgr/tests: Fix test failures on Windows XP. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/tests/job.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index 6d8185a078..8bc82dd172 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -507,7 +507,7 @@ static void test_Cancel(void) static void test_HttpOptions(void) { static const WCHAR urlW[] = - {'h','t','t','p','s',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/',0}; + {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/',0}; static const WCHAR winetestW[] = {'W','i','n','e',':',' ','t','e','s','t','\r','\n',0}; static const unsigned int timeout = 30;

1 0

Lauri Kenttä : po: Update Finnish translations.
by Alexandre Julliard 02 Jan '20

02 Jan '20

Module: wine Branch: master Commit: 34925faa7d0e28025bcf7344b608479ae6fa1fc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34925faa7d0e28025bcf7344… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Jan 2 09:06:36 2020 +0200 po: Update Finnish translations. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/po/fi.po b/po/fi.po index 6ce7adb00b..aaa1c10adf 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8287,26 +8287,20 @@ msgid "Off" msgstr "Pois päältä" #: version.rc:42 -#, fuzzy -#| msgid "video" msgid "Provider" -msgstr "video" +msgstr "Tarjoaja" #: version.rc:45 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "Valitse käytettävä muoto:" +msgstr "Valitse data, johon haluat yhdistää:" #: version.rc:36 -#, fuzzy -#| msgid "Properties" msgid "Data Link Properties" -msgstr "Ominaisuudet" +msgstr "Datayhteyden ominaisuudet" #: version.rc:37 msgid "OLE DB Provider(s)" -msgstr "" +msgstr "OLE DB -tarjoaja(t)" #: oledlg.rc:55 msgid "Insert Object"

1 0

Erich E. Hoover : msvcrt: Rework strtod_helper to be reusable.
by Alexandre Julliard 02 Jan '20

02 Jan '20

Module: wine Branch: master Commit: b12d6d405ab89477dee1083f4af4b858a118ff46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b12d6d405ab89477dee1083f… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Tue Dec 31 11:19:07 2019 -0700 msvcrt: Rework strtod_helper to be reusable. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 2 + dlls/msvcrt/string.c | 265 +++++++++++++++++++++++++++++++-------------------- 2 files changed, 163 insertions(+), 104 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b12d6d405ab89477dee1…

1 0

Erich E. Hoover : msvcrt: Use parse_double for wcstod.
by Alexandre Julliard 02 Jan '20

02 Jan '20

Module: wine Branch: master Commit: 66c9c358ae5c50fc246cf4a4e280b401a5fc730b URL: https://source.winehq.org/git/wine.git/?a=commit;h=66c9c358ae5c50fc246cf4a4… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Tue Dec 31 16:00:11 2019 -0700 msvcrt: Use parse_double for wcstod. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/wcs.c | 130 ++++++++------------------------------------------- 2 files changed, 20 insertions(+), 111 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 84e3b013bc..244df7d23c 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1073,6 +1073,7 @@ int __cdecl MSVCRT_iswdigit(MSVCRT_wint_t); int __cdecl MSVCRT_isleadbyte(int); int __cdecl MSVCRT__isleadbyte_l(int, MSVCRT__locale_t); int __cdecl MSVCRT__isspace_l(int, MSVCRT__locale_t); +int __cdecl MSVCRT__iswspace_l(MSVCRT_wchar_t, MSVCRT__locale_t); void __cdecl MSVCRT__lock_file(MSVCRT_FILE*); void __cdecl MSVCRT__unlock_file(MSVCRT_FILE*); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 6d03997d9e..1abe28b7d9 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -381,15 +381,17 @@ int CDECL MSVCRT__wcsncoll(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str return MSVCRT__wcsncoll_l(str1, str2, count, NULL); } -static double MSVCRT_mul_pow10(double x, int exp) +static MSVCRT_wchar_t strtod_wstr_get(void *ctx) { - BOOL negexp = (exp < 0); - double ret; + const MSVCRT_wchar_t **p = ctx; + if (!**p) return MSVCRT_WEOF; + return *(*p)++; +} - if(negexp) - exp = -exp; - ret = pow(10.0, exp); - return (negexp ? x/ret : x*ret); +static void strtod_wstr_unget(void *ctx) +{ + const MSVCRT_wchar_t **p = ctx; + (*p)--; } /********************************************************************* @@ -398,121 +400,27 @@ static double MSVCRT_mul_pow10(double x, int exp) double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, MSVCRT__locale_t locale) { - int exp1=0, exp2=0, exp3=0, sign=1; MSVCRT_pthreadlocinfo locinfo; - unsigned __int64 d=0, hlp; - BOOL found_digit = FALSE; - unsigned fpcontrol; - const MSVCRT_wchar_t *p; + const MSVCRT_wchar_t *beg, *p; double ret; - if (!MSVCRT_CHECK_PMT(str != NULL)) return 0; + if (!MSVCRT_CHECK_PMT(str != NULL)) { + if (end) *end = NULL; + return 0; + } - if(!locale) + if (!locale) locinfo = get_locinfo(); else locinfo = locale->locinfo; p = str; - while(isspaceW(*p)) - p++; - - if(*p == '-') { - sign = -1; - p++; - } else if(*p == '+') - p++; - - while(*p>='0' && *p<='9') { - found_digit = TRUE; - hlp = d*10+*(p++)-'0'; - if(d>MSVCRT_UI64_MAX/10 || hlp<d) { - exp1++; - break; - } else - d = hlp; - } - while(*p>='0' && *p<='9') { - exp1++; - p++; - } - if(*p == *locinfo->lconv->decimal_point) + while(MSVCRT__iswspace_l(*p, locale)) p++; + beg = p; - while(*p>='0' && *p<='9') { - found_digit = TRUE; - hlp = d*10+*(p++)-'0'; - if(d>MSVCRT_UI64_MAX/10 || hlp<d) - break; - - d = hlp; - exp1--; - } - while(*p>='0' && *p<='9') - p++; - - if(!found_digit) { - if(end) - *end = (MSVCRT_wchar_t*)str; - return 0.0; - } - - if(*p=='e' || *p=='E' || *p=='d' || *p=='D') { - int e=0, s=1; - - p++; - if(*p == '-') { - s = -1; - p++; - } else if(*p == '+') - p++; - - if(*p>='0' && *p<='9') { - while(*p>='0' && *p<='9') { - if(e>INT_MAX/10 || (e=e*10+*p-'0')<0) - e = INT_MAX; - p++; - } - e *= s; - - if(exp1<0 && e<0 && exp1+e>=0) exp1 = INT_MIN; - else if(exp1>0 && e>0 && exp1+e<0) exp1 = INT_MAX; - else exp3 += e; - } else { - if(*p=='-' || *p=='+') - p--; - p--; - } - } - - fpcontrol = _control87(0, 0); - _control87(MSVCRT__EM_DENORMAL|MSVCRT__EM_INVALID|MSVCRT__EM_ZERODIVIDE - |MSVCRT__EM_OVERFLOW|MSVCRT__EM_UNDERFLOW|MSVCRT__EM_INEXACT|MSVCRT__PC_64, - MSVCRT__MCW_EM | MSVCRT__MCW_PC ); - - /* take the number without exponent and convert it into a double */ - ret = MSVCRT_mul_pow10(d, exp1); - /* shift the number to the representation where the first non-zero digit is in the ones place */ - exp2 = (ret != 0.0 ? (int)round(log10(ret)) : 0); - if (exp3-exp2 >= MSVCRT_FLT_MIN_10_EXP && exp3-exp2 <= MSVCRT_FLT_MAX_10_EXP) - exp2 = 0; /* only bother to take this extra step with very small or very large numbers */ - /* incorporate an additional shift to deal with floating point denormal values (if necessary) */ - if(exp3-exp2 < MSVCRT_DBL_MIN_10_EXP) - exp2 += exp3-exp2-MSVCRT_DBL_MIN_10_EXP; - ret = MSVCRT_mul_pow10(ret, exp2); - /* apply the exponent (and undo any shift) */ - ret = MSVCRT_mul_pow10(ret, exp3-exp2); - /* apply the sign bit */ - ret *= sign; - - _control87( fpcontrol, MSVCRT__MCW_EM | MSVCRT__MCW_PC ); - - if((d && ret==0.0) || isinf(ret)) - *MSVCRT__errno() = MSVCRT_ERANGE; - - if(end) - *end = (MSVCRT_wchar_t*)p; - + ret = parse_double(strtod_wstr_get, strtod_wstr_unget, &p, locinfo, NULL); + if (end) *end = (p == beg ? (MSVCRT_wchar_t*)str : (MSVCRT_wchar_t*)p); return ret; }

1 0

Erich E. Hoover : msvcrt: Use parse_double for scanf floats.
by Alexandre Julliard 02 Jan '20

02 Jan '20

Module: wine Branch: master Commit: f99d307a3e1f9beb7fd9dc8892b5cfabbabf816b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f99d307a3e1f9beb7fd9dc88… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Thu Jan 2 19:01:56 2020 +0100 msvcrt: Use parse_double for scanf floats. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scanf.c | 16 ++--- dlls/msvcrt/scanf.h | 183 ++++++++++++++++++++++----------------------------- dlls/msvcrt/string.c | 3 + 3 files changed, 90 insertions(+), 112 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f99d307a3e1f9beb7fd9…

1 0