December 2019 - Wine-commits

Francois Gouget : testbot/Janitor: Fix extracting the VM name from reference report filenames.
by Alexandre Julliard 05 Dec '19

05 Dec '19

Module: tools Branch: master Commit: dc3a53cea57cee685cb79714ed68e8a0f375f7bc URL: https://source.winehq.org/git/tools.git/?a=commit;h=dc3a53cea57cee685cb7971… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 5 13:22:16 2019 +0100 testbot/Janitor: Fix extracting the VM name from reference report filenames. The log name part can contain underscores and uppercase letters when testing locales. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 537a0dc..c51637a 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -308,7 +308,7 @@ if (opendir(my $dh, "$DataDir/latest")) { next if ($Entry eq "." or $Entry eq ".."); - if ($Entry =~ /^(.*)_[a-z0-9]+\.report(?:\.err)?$/) + if ($Entry =~ /^([a-zA-Z0-9_]+)_(?:exe|win|wow)(?:32|64)[a-zA-Z0-9_]*\.report(?:\.err)?$/) { # Keep the reference WineTest reports for all VMs even if they are # retired or scheduled for deletion.

1 0

Francois Gouget : testbot/WineSendLog: Errors are not new when missing reference reports.
by Alexandre Julliard 05 Dec '19

05 Dec '19

Module: tools Branch: master Commit: 84ecff2af7c128f3fe6cdd3b9ef26ff255cc72d7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=84ecff2af7c128f3fe6cdd3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 5 13:23:04 2019 +0100 testbot/WineSendLog: Errors are not new when missing reference reports. Build logs don't have reference logs so for them every error is new. But test reports should have reference WineTest results and if not reporting the errors as new would cause false positives. So default to "not new" in that case. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 721122e..95cc036 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -291,8 +291,11 @@ EOF my ($NewGroups, $NewErrors, $_NewIndices) = GetNewLogErrors($RefFileName, $LogErrors->{Groups}, $LogErrors->{Errors}); if (!$NewGroups) { - # There was no reference log (typical of build logs) - # so every error is new + # Test reports should have reference WineTest results and if not + # reporting the errors as new would cause false positives. + next if ($LogName =~ /\.report$/); + + # Build logs don't have reference logs so for them every error is new. $NewGroups = $LogErrors->{Groups}; $NewErrors = $LogErrors->{Errors}; }

1 0

Francois Gouget : testbot/LogUtils: GetLogFileNames() should untaint the returned log names.
by Alexandre Julliard 05 Dec '19

05 Dec '19

Module: tools Branch: master Commit: 8ac3bc8cf7f31318599909ce757aa6974e477157 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8ac3bc8cf7f31318599909c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 5 13:23:19 2019 +0100 testbot/LogUtils: GetLogFileNames() should untaint the returned log names. Otherwise the caller may get an error when trying to use them for file operations (such as unlink). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 32bf0fa..4a17857 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -634,13 +634,21 @@ sub GetLogFileNames($;$) foreach my $FileName (glob("'$Dir/$Glob*'")) { my $LogName = basename($FileName); - if ($LogName !~ s/\.err$// and $LogName !~ /\.report$/ and - $LogName ne $Glob) # 'log' case + $LogName =~ s/\.err$//; + next if ($Seen{$LogName}); + if ($LogName =~ /^([a-zA-Z0-9_]+\.report)$/) + { + $LogName = $1; # untaint + } + elsif ($LogName eq $Glob) # log and old_log cases + { + $LogName = $Glob; # untaint + } + else { # Not a valid log filename (where does this file come from?) next; } - next if ($Seen{$LogName}); $Seen{$LogName} = 1; if ((-f "$Dir/$LogName" and !-z "$Dir/$LogName") or

1 0

Piotr Caban : msvcrt: Don't depend on how __lc_time_data was allocated in _Gettnames.
by Alexandre Julliard 04 Dec '19

04 Dec '19

Module: wine Branch: master Commit: 1b6eee3069037f291b3986af1ce6ce143ab53659 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b6eee3069037f291b3986af… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 4 15:30:38 2019 +0100 msvcrt: Don't depend on how __lc_time_data was allocated in _Gettnames. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 52052a4502..fdb4436a3d 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -604,7 +604,7 @@ MSVCRT_wchar_t* CDECL _W_Getmonths(void) void* CDECL _Gettnames(void) { MSVCRT___lc_time_data *ret, *cur = get_locinfo()->lc_time_curr; - unsigned int i, size = sizeof(MSVCRT___lc_time_data); + unsigned int i, len, size = sizeof(MSVCRT___lc_time_data); TRACE("\n"); @@ -614,12 +614,14 @@ void* CDECL _Gettnames(void) ret = MSVCRT_malloc(size); if(!ret) return NULL; - memcpy(ret, cur, size); + memcpy(ret, cur, sizeof(*ret)); size = 0; for(i=0; i<ARRAY_SIZE(cur->str.str); i++) { + len = strlen(cur->str.str[i])+1; + memcpy(&ret->data[size], cur->str.str[i], len); ret->str.str[i] = &ret->data[size]; - size += strlen(&ret->data[size])+1; + size += len; } return ret;

1 0

Piotr Caban : msvcrt: Mark __lc_time_data strings const.
by Alexandre Julliard 04 Dec '19

04 Dec '19

Module: wine Branch: master Commit: c4b41fd4f191f7db0ec1865fec73c6a2839b83e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4b41fd4f191f7db0ec1865f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 4 15:30:45 2019 +0100 msvcrt: Mark __lc_time_data strings const. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 2 +- dlls/msvcrt/msvcrt.h | 42 +++++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index fdb4436a3d..3a789c7229 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1016,7 +1016,7 @@ static MSVCRT___lc_time_data* create_time_data(LCID lcid) } #if _MSVCR_VER >= 110 cur->locname = (MSVCRT_wchar_t*)&cur->data[ret]; - LCIDToLocaleName(lcid, cur->locname, (size-ret)/sizeof(MSVCRT_wchar_t), 0); + LCIDToLocaleName(lcid, (MSVCRT_wchar_t*)&cur->data[ret], (size-ret)/sizeof(MSVCRT_wchar_t), 0); #else cur->lcid = lcid; #endif diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 4a7e6f4219..15d3ef69ef 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -125,17 +125,17 @@ typedef struct MSVCRT_tagLC_ID { typedef struct { union { - char *str[43]; + const char *str[43]; struct { - char *short_wday[7]; - char *wday[7]; - char *short_mon[12]; - char *mon[12]; - char *am; - char *pm; - char *short_date; - char *date; - char *time; + const char *short_wday[7]; + const char *wday[7]; + const char *short_mon[12]; + const char *mon[12]; + const char *am; + const char *pm; + const char *short_date; + const char *date; + const char *time; } names; } str; #if _MSVCR_VER < 110 @@ -143,21 +143,21 @@ typedef struct { #endif int unk[2]; union { - MSVCRT_wchar_t *wstr[43]; + const MSVCRT_wchar_t *wstr[43]; struct { - MSVCRT_wchar_t *short_wday[7]; - MSVCRT_wchar_t *wday[7]; - MSVCRT_wchar_t *short_mon[12]; - MSVCRT_wchar_t *mon[12]; - MSVCRT_wchar_t *am; - MSVCRT_wchar_t *pm; - MSVCRT_wchar_t *short_date; - MSVCRT_wchar_t *date; - MSVCRT_wchar_t *time; + const MSVCRT_wchar_t *short_wday[7]; + const MSVCRT_wchar_t *wday[7]; + const MSVCRT_wchar_t *short_mon[12]; + const MSVCRT_wchar_t *mon[12]; + const MSVCRT_wchar_t *am; + const MSVCRT_wchar_t *pm; + const MSVCRT_wchar_t *short_date; + const MSVCRT_wchar_t *date; + const MSVCRT_wchar_t *time; } names; } wstr; #if _MSVCR_VER >= 110 - MSVCRT_wchar_t *locname; + const MSVCRT_wchar_t *locname; #endif char data[1]; } MSVCRT___lc_time_data;

1 0

Jeff Smith : msvcrt: Create global C locale __lc_time_data struct.
by Alexandre Julliard 04 Dec '19

04 Dec '19

Module: wine Branch: master Commit: f174eb072df35b8ece02654f8ead39d81cabe89b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f174eb072df35b8ece02654f… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Dec 4 16:22:14 2019 +0100 msvcrt: Create global C locale __lc_time_data struct. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 158 +++++++++++++++++++++++++++++++-------------------- dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 97 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f174eb072df35b8ece02…

1 0

Jeff Smith : ucrtbase: Correct behavior of strftime formats %c %r.
by Alexandre Julliard 04 Dec '19

04 Dec '19

Module: wine Branch: master Commit: 0b78dd17aed035b430ce6e9b5a0087f4dcb38ee7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b78dd17aed035b430ce6e9b… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Dec 4 15:30:57 2019 +0100 ucrtbase: Correct behavior of strftime formats %c %r. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 14 +++++++++++++- dlls/ucrtbase/tests/misc.c | 8 ++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index ef4f228554..7f565e350d 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1234,6 +1234,18 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, switch(*format) { case 'c': +#if _MSVCR_VER>=140 + if(time_data == &cloc_time_data && !alternate) + { + static const WCHAR datetime_format[] = + { '%','a',' ','%','b',' ','%','e',' ','%','T',' ','%','Y',0 }; + tmp = strftime_impl(str+ret, max-ret, datetime_format, mstm, time_data, loc); + if(!tmp) + return 0; + ret += tmp; + break; + } +#endif if(!strftime_format(str, &ret, max, mstm, time_data, alternate ? STRFTIME_TD(time_data, date) : STRFTIME_TD(time_data, short_date))) return 0; @@ -1387,7 +1399,7 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, break; #if _MSVCR_VER>=140 case 'r': - if(time_data == MSVCRT_locale->locinfo->lc_time_curr) + if(time_data == &cloc_time_data) { if(!MSVCRT_CHECK_PMT(mstm->tm_hour>=0 && mstm->tm_hour<=23)) goto einval_error; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index a3a20aa9b1..f637997a0d 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -1004,8 +1004,8 @@ static void test_strftime(void) {"%y", "00", { 0, 0, 0, 0, 0, -1900, 0, 0, 0 }}, {"%y", "99", { 0, 0, 0, 0, 0, 8099, 0, 0, 0 }}, {"%y", "", { 0, 0, 0, 0, 0, 8100, 0, 0, 0 }}, - {"%c", "Thu Jan 1 00:00:00 1970", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }, TRUE, TRUE}, - {"%c", "Thu Feb 30 00:00:00 1970", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }, TRUE, TRUE}, + {"%c", "Thu Jan 1 00:00:00 1970", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%c", "Thu Feb 30 00:00:00 1970", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }}, {"%#c", "Thursday, January 01, 1970 00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%#c", "Thursday, February 30, 1970 00:00:00", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }}, {"%x", "01/01/70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, @@ -1197,8 +1197,8 @@ static void test_strftime(void) ok(ret == 19, "ret = %d\n", ret); ok(!strcmp(buf, "01/01/1970 00:00:00"), "buf = \"%s\", expected \"%s\"\n", buf, "01/01/1970 00:00:00"); ret = p_strftime(buf, sizeof(buf), "%r", &epoch); - todo_wine ok(ret == 8, "ret = %d\n", ret); - todo_wine ok(!strcmp(buf, "00:00:00"), "buf = \"%s\", expected \"%s\"\n", buf, "00:00:00"); + ok(ret == 8, "ret = %d\n", ret); + ok(!strcmp(buf, "00:00:00"), "buf = \"%s\", expected \"%s\"\n", buf, "00:00:00"); p_setlocale(LC_ALL, "C"); }

1 0

Paul Gofman : ntdll: Add DECLSPEC_HOTPATCH to NtProtectVirtualMemory().
by Alexandre Julliard 04 Dec '19

04 Dec '19

Module: wine Branch: master Commit: 923e62eb553596718df9e19b2a7b6482cc7deb15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=923e62eb553596718df9e19b… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Dec 4 14:02:12 2019 +0300 ntdll: Add DECLSPEC_HOTPATCH to NtProtectVirtualMemory(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48077 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 68249de902..cb869feff0 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2797,8 +2797,8 @@ NTSTATUS WINAPI NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *si * NtProtectVirtualMemory (NTDLL.@) * ZwProtectVirtualMemory (NTDLL.@) */ -NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *size_ptr, - ULONG new_prot, ULONG *old_prot ) +NTSTATUS WINAPI DECLSPEC_HOTPATCH NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *size_ptr, + ULONG new_prot, ULONG *old_prot ) { struct file_view *view; sigset_t sigset;

1 0

Andrey Gusev : mshtml/tests: Fix a typo in ok() message.
by Alexandre Julliard 04 Dec '19

04 Dec '19

Module: wine Branch: master Commit: 83654685f6cdd60df80eb7d1c3033141113665e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83654685f6cdd60df80eb7d1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Nov 29 11:38:59 2019 +0200 mshtml/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ff7c62bdfc..3234e66cd5 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2058,7 +2058,7 @@ static IHTMLDOMAttribute *_create_attr(unsigned line, IUnknown *unk, const char HRESULT hres; hres = IHTMLDocument5_createAttribute(doc, str, &attr); - ok_(__FILE__,line)(hres == S_OK, "createAttribute dailed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "createAttribute failed: %08x\n", hres); SysFreeString(str); IHTMLDocument5_Release(doc);

1 0

Francois Gouget : vbscript/tests: Fix the name of a vbscript variable in the run test.
by Alexandre Julliard 04 Dec '19

04 Dec '19

Module: wine Branch: master Commit: 67d1321c2b8eb5d54aa8fbe0807d9052ae56c1ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=67d1321c2b8eb5d54aa8fbe0… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 4 18:08:38 2019 +0100 vbscript/tests: Fix the name of a vbscript variable in the run test. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/run.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 5fc23707e3..5357ab1f12 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2206,7 +2206,7 @@ static void test_callbacks(void) L" on error resume next\n" L" err.raise 2\n" L" call test.globalCallback(new CallbackClass)\n" - L" call ok(err.number = 2, \"err.number = \" & err.numner)\n" + L" call ok(err.number = 2, \"err.number = \" & err.number)\n" L"end function\n", NULL, NULL, NULL, 0, 0, 0, NULL, NULL); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); @@ -2268,7 +2268,7 @@ static void test_callbacks(void) if(is_english) { ok(!wcscmp(ei.bstrSource, L"Microsoft VBScript runtime error"), "bstrSource = %s\n", wine_dbgstr_w(ei.bstrSource)); - ok(!wcscmp(ei.bstrDescription, L"Object doesn't support this property or method"), + ok(!wcscmp(ei.bstrDescription, L"Unknown runtime error"), "bstrDescription = %s\n", wine_dbgstr_w(ei.bstrDescription)); } ok(!ei.bstrHelpFile, "bstrHelpFile = %s\n", wine_dbgstr_w(ei.bstrHelpFile));

1 0