February 2020 - Wine-commits

Jacek Caban : oleaut32/tests: Use Unicode strings for file names.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: f7e357aa5f094367e59302f6c731eab2eb48b7af URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7e357aa5f094367e59302f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 10 14:56:20 2020 +0100 oleaut32/tests: Use Unicode strings for file names. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 58 +++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 35 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 4ffbaa9e2d..2a84cd92e9 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -775,14 +775,14 @@ static void test_CreateDispTypeInfo(void) SysFreeString(methdata[3].szName); } -static void write_typelib(int res_no, const char *filename) +static void write_typelib(int res_no, const WCHAR *filename) { DWORD written; HANDLE file; HRSRC res; void *ptr; - file = CreateFileA( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + file = CreateFileW( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); ok( file != INVALID_HANDLE_VALUE, "file creation failed\n" ); if (file == INVALID_HANDLE_VALUE) return; res = FindResourceA( GetModuleHandleA(NULL), (LPCSTR)MAKEINTRESOURCE(res_no), "TYPELIB" ); @@ -820,11 +820,11 @@ static void test_invoke_func(ITypeInfo *typeinfo) ok(hres == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hres); } -static const char *create_test_typelib(int res_no) +static WCHAR *create_test_typelib(int res_no) { - static char filename[MAX_PATH]; + static WCHAR filename[MAX_PATH]; - GetTempFileNameA( ".", "tlb", 0, filename ); + GetTempFileNameW(L".", L"tlb", 0, filename); write_typelib(res_no, filename); return filename; } @@ -847,8 +847,7 @@ static void test_TypeInfo(void) VARIANT var, res, args[2]; UINT count, i; TYPEKIND kind; - const char *filenameA; - WCHAR filename[MAX_PATH]; + const WCHAR *filename; TYPEATTR *attr; LONG l; @@ -1029,8 +1028,7 @@ static void test_TypeInfo(void) ITypeInfo_Release(pTypeInfo); ITypeLib_Release(pTypeLib); - filenameA = create_test_typelib(3); - MultiByteToWideChar(CP_ACP, 0, filenameA, -1, filename, MAX_PATH); + filename = create_test_typelib(3); hr = LoadTypeLib(filename, &pTypeLib); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1132,7 +1130,7 @@ static void test_TypeInfo(void) ITypeInfo_Release(pTypeInfo); ITypeLib_Release(pTypeLib); - DeleteFileA(filenameA); + DeleteFileW(filename); } static int WINAPI int_func( int a0, int a1, int a2, int a3, int a4 ) @@ -4180,16 +4178,14 @@ static int get_href_type(ITypeInfo *info, TYPEDESC *tdesc) return href_type; } -static void test_dump_typelib(const char *name) +static void test_dump_typelib(const WCHAR *name) { - WCHAR wszString[260]; ITypeInfo *info; ITypeLib *lib; int count; int i; - MultiByteToWideChar(CP_ACP, 0, name, -1, wszString, 260); - OLE_CHECK(LoadTypeLib(wszString, &lib)); + OLE_CHECK(LoadTypeLib(name, &lib)); printf("/*** Autogenerated data. Do not edit, change the generator above instead. ***/\n"); @@ -4797,15 +4793,13 @@ static const type_info info[] = { expect_hex(U(*(elem)).paramdesc.wParamFlags, (info)->wParamFlags); \ } -static void test_dump_typelib(const char *name) +static void test_dump_typelib(const WCHAR *name) { - WCHAR wszName[MAX_PATH]; ITypeLib *typelib; int ticount = ARRAY_SIZE(info); int iface, func; - MultiByteToWideChar(CP_ACP, 0, name, -1, wszName, MAX_PATH); - ole_check(LoadTypeLibEx(wszName, REGKIND_NONE, &typelib)); + ole_check(LoadTypeLibEx(name, REGKIND_NONE, &typelib)); expect_eq(ITypeLib_GetTypeInfoCount(typelib), ticount, UINT, "%d"); for (iface = 0; iface < ticount; iface++) { @@ -4998,8 +4992,7 @@ static void test_create_typelibs(void) static void test_register_typelib(BOOL system_registration) { HRESULT hr; - WCHAR filename[MAX_PATH]; - const char *filenameA; + WCHAR *filename; ITypeLib *typelib; WCHAR uuidW[40]; char key_name[MAX_PATH], uuid[40]; @@ -5043,8 +5036,7 @@ static void test_register_typelib(BOOL system_registration) if (pIsWow64Process) pIsWow64Process(GetCurrentProcess(), &is_wow64); - filenameA = create_test_typelib(3); - MultiByteToWideChar(CP_ACP, 0, filenameA, -1, filename, MAX_PATH); + filename = create_test_typelib(3); hr = LoadTypeLibEx(filename, REGKIND_NONE, &typelib); ok(hr == S_OK, "got %08x\n", hr); @@ -5057,7 +5049,7 @@ static void test_register_typelib(BOOL system_registration) { win_skip("Insufficient privileges to register typelib in the registry\n"); ITypeLib_Release(typelib); - DeleteFileA(filenameA); + DeleteFileW(filename); return; } ok(hr == S_OK, "got %08x\n", hr); @@ -5187,7 +5179,7 @@ static void test_register_typelib(BOOL system_registration) } ITypeLib_Release(typelib); - DeleteFileA( filenameA ); + DeleteFileW(filename); } static void test_LoadTypeLib(void) @@ -5795,8 +5787,8 @@ static void test_LoadRegTypeLib(void) DeleteFileA("main.manifest"); /* create typelib file */ - write_typelib(1, "test_actctx_tlb.tlb"); - write_typelib(3, "test_actctx_tlb2.tlb"); + write_typelib(1, L"test_actctx_tlb.tlb"); + write_typelib(3, L"test_actctx_tlb2.tlb"); hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, &tl); ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr); @@ -6377,8 +6369,7 @@ static void test_stub(void) static void test_dep(void) { HRESULT hr; - const char *refFilename; - WCHAR refFilenameW[MAX_PATH]; + const WCHAR *refFilename; ITypeLib *preftLib; ITypeInfo *preftInfo; char filename[MAX_PATH]; @@ -6398,9 +6389,7 @@ static void test_dep(void) { trace("Starting typelib dependency tests\n"); refFilename = create_test_typelib(2); - MultiByteToWideChar(CP_ACP, 0, refFilename, -1, refFilenameW, MAX_PATH); - - hr = LoadTypeLibEx(refFilenameW, REGKIND_NONE, &preftLib); + hr = LoadTypeLibEx(refFilename, REGKIND_NONE, &preftLib); ok(hr == S_OK, "got %08x\n", hr); hr = ITypeLib_GetTypeInfoOfGuid(preftLib, &IID_ISimpleIface, &preftInfo); @@ -6447,8 +6436,7 @@ static void test_dep(void) { ITypeInfo_Release(preftInfo); ITypeLib_Release(preftLib); - - DeleteFileW(refFilenameW); + DeleteFileW(refFilename); hr = LoadTypeLibEx(filenameW, REGKIND_NONE, &ptLib); ok(hr == S_OK, "got: %x\n", hr); @@ -6569,7 +6557,7 @@ static void test_DeleteImplType(void) START_TEST(typelib) { - const char *filename; + const WCHAR *filename; init_function_pointers(); @@ -6595,7 +6583,7 @@ START_TEST(typelib) if ((filename = create_test_typelib(2))) { test_dump_typelib( filename ); - DeleteFileA( filename ); + DeleteFileW( filename ); } test_register_typelib(TRUE);

1 0

Alexandre Julliard : unicode: Add JIS-0212 mappings to the 20932 (EUC-JP) codepage table.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: d94b605a8a722fa491784bdc95c952f0c2ab2497 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d94b605a8a722fa491784bdc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 8 10:30:58 2020 +0100 unicode: Add JIS-0212 mappings to the 20932 (EUC-JP) codepage table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/c_20932.c | 7804 ++++++++++++++++++++++++++------------------------- tools/make_unicode | 88 +- 2 files changed, 4092 insertions(+), 3800 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d94b605a8a722fa49178…

1 0

Alexandre Julliard : unicode: Support fetching a zip containining the data files.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: 44ce5d9283aaaa7944095118475c6ebfef0e18ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=44ce5d9283aaaa7944095118… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 8 13:03:35 2020 +0100 unicode: Support fetching a zip containining the data files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/bracket.c | 2 +- dlls/dwrite/linebreak.c | 2 +- dlls/dwrite/mirror.c | 2 +- dlls/dwrite/scripts.c | 2 +- dlls/dwrite/scripts.h | 2 +- dlls/gdi32/vertical.c | 2 +- dlls/kernelbase/compose.c | 2 +- dlls/kernelbase/decompose.c | 2 +- dlls/kernelbase/digitmap.c | 2 +- dlls/ntdll/combclass.c | 2 +- dlls/usp10/bracket.c | 2 +- dlls/usp10/indicsyllable.c | 4 ++-- dlls/usp10/linebreak.c | 2 +- dlls/usp10/mirror.c | 2 +- dlls/usp10/shaping.c | 2 +- dlls/wineps.drv/vertical.c | 2 +- libs/port/casemap.c | 2 +- libs/port/compose.c | 2 +- libs/port/decompose.c | 2 +- tools/make_unicode | 47 +++++++++++++++++++++++++++++---------------- 20 files changed, 50 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=44ce5d9283aaaa794409…

1 0

Alexandre Julliard : unicode: Use codepage files from Microsoft's Open Specification data.
by Alexandre Julliard 10 Feb '20

10 Feb '20

1 0

Alexandre Julliard : unicode: Remove some codepages that don't exist on Windows.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: cb524e09a6981bee17aea676f794133144b55519 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb524e09a6981bee17aea676… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 10 09:13:04 2020 +0100 unicode: Remove some codepages that don't exist on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 8 - libs/port/c_1006.c | 729 ----------------------------------------------- libs/port/c_28600.c | 692 -------------------------------------------- libs/port/c_28601.c | 725 ---------------------------------------------- libs/port/c_28604.c | 692 -------------------------------------------- libs/port/c_28606.c | 692 -------------------------------------------- libs/port/c_424.c | 723 ---------------------------------------------- libs/port/c_856.c | 723 ---------------------------------------------- libs/port/c_878.c | 760 ------------------------------------------------- libs/port/cptable.c | 18 +- loader/wine.inf.in | 8 - tools/make_unicode | 166 +---------- tools/unicode-defaults | 202 ------------- 13 files changed, 4 insertions(+), 6134 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cb524e09a6981bee17ae…

1 0

Alex Henrie : iphlpapi: Remove unnecessary memcpy from build_udp6_table.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: 71affb289207bb511f4b649cce41cb5362b2e427 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71affb289207bb511f4b649c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Feb 8 23:50:02 2020 -0700 iphlpapi: Remove unnecessary memcpy from build_udp6_table. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 83259f4743..f09f042135 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2719,13 +2719,12 @@ DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE ptr = fgets( buf, sizeof(buf), fp ); while ((ptr = fgets( buf, sizeof(buf), fp ))) { - DWORD in6_addr32[4]; + DWORD *local_addr = (DWORD *)&row.ucLocalAddr; if (sscanf( ptr, "%u: %8x%8x%8x%8x:%x %*s %*s %*s %*s %*s %*s %*s %d", &dummy, - &in6_addr32[0], &in6_addr32[1], &in6_addr32[2], &in6_addr32[3], + &local_addr[0], &local_addr[1], &local_addr[2], &local_addr[3], &row.dwLocalPort, &inode ) != 7) continue; - memcpy(&row.ucLocalAddr, in6_addr32, sizeof(row.ucLocalAddr)); row.dwLocalScopeId = find_ipv6_addr_scope((const IN6_ADDR *)&row.ucLocalAddr, addr_scopes, addr_scopes_size); row.dwLocalPort = htons( row.dwLocalPort );

1 0

Alex Henrie : iphlpapi/tests: Build rotating buffers into ntoa and ntoa6.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: 433990d60db3523a62a7fc8d8a2195b904d2169c URL: https://source.winehq.org/git/wine.git/?a=commit;h=433990d60db3523a62a7fc8d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Feb 9 23:00:34 2020 -0700 iphlpapi/tests: Build rotating buffers into ntoa and ntoa6. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 42 +++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 1b0bc9383a..a1fdf2716b 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -169,28 +169,25 @@ static void freeIPHlpApi(void) /* replacement for inet_ntoa */ static const char *ntoa( DWORD ip ) { - static char buffer[40]; + static char buffers[4][16]; + static int i = -1; ip = htonl(ip); - sprintf( buffer, "%u.%u.%u.%u", (ip >> 24) & 0xff, (ip >> 16) & 0xff, (ip >> 8) & 0xff, ip & 0xff ); - return buffer; + i = (i + 1) % ARRAY_SIZE(buffers); + sprintf( buffers[i], "%u.%u.%u.%u", (ip >> 24) & 0xff, (ip >> 16) & 0xff, (ip >> 8) & 0xff, ip & 0xff ); + return buffers[i]; } static const char *ntoa6( IN6_ADDR *ip ) { - static char buffer[40]; - char *buf = buffer; + static char buffers[4][40]; + static int i = -1; unsigned short *p = ip->u.Word; - unsigned int i = 0; - while (i < 8) - { - if (i > 0) - *buf++ = ':'; - buf += sprintf( buf, "%x", htons(p[i]) ); - i++; - } - return buffer; + i = (i + 1) % ARRAY_SIZE(buffers); + sprintf( buffers[i], "%x:%x:%x:%x:%x:%x:%x:%x", + htons(p[0]), htons(p[1]), htons(p[2]), htons(p[3]), htons(p[4]), htons(p[5]), htons(p[6]), htons(p[7]) ); + return buffers[i]; } /* @@ -382,8 +379,6 @@ static void testGetIpForwardTable(void) trace( "IP forward table: %u entries\n", buf->dwNumEntries ); for (i = 0; i < buf->dwNumEntries; i++) { - char buffer[100]; - if (!U1(buf->table[i]).dwForwardDest) /* Default route */ { todo_wine @@ -403,9 +398,8 @@ todo_wine * value so it is not worth testing in this case. */ } - sprintf( buffer, "dest %s", ntoa( buf->table[i].dwForwardDest )); - sprintf( buffer + strlen(buffer), " mask %s", ntoa( buf->table[i].dwForwardMask )); - trace( "%u: %s gw %s if %u type %u proto %u\n", i, buffer, + trace( "%u: dest %s mask %s gw %s if %u type %u proto %u\n", i, + ntoa( buf->table[i].dwForwardDest ), ntoa( buf->table[i].dwForwardMask ), ntoa( buf->table[i].dwForwardNextHop ), buf->table[i].dwForwardIfIndex, U1(buf->table[i]).dwForwardType, U1(buf->table[i]).dwForwardProto ); } @@ -890,12 +884,10 @@ static void testGetTcpTable(void) trace( "TCP table: %u entries\n", buf->dwNumEntries ); for (i = 0; i < buf->dwNumEntries; i++) { - char buffer[40]; - sprintf( buffer, "local %s:%u", - ntoa(buf->table[i].dwLocalAddr), ntohs(buf->table[i].dwLocalPort) ); - trace( "%u: %s remote %s:%u state %u\n", - i, buffer, ntoa( buf->table[i].dwRemoteAddr ), - ntohs(buf->table[i].dwRemotePort), U(buf->table[i]).dwState ); + trace( "%u: local %s:%u remote %s:%u state %u\n", i, + ntoa(buf->table[i].dwLocalAddr), ntohs(buf->table[i].dwLocalPort), + ntoa(buf->table[i].dwRemoteAddr), ntohs(buf->table[i].dwRemotePort), + U(buf->table[i]).dwState ); } } HeapFree(GetProcessHeap(), 0, buf);

1 0

Francois Gouget : testbot: Cache the log error lists in .errors files.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: tools Branch: master Commit: 99dbbf84b0191d0827a71e9c7a32a9e40e3ce1d3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=99dbbf84b0191d0827a71e9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Feb 9 18:43:56 2020 +0100 testbot: Cache the log error lists in .errors files. Prior to this patch the log files needed to be parsed every time the error list is needed. Parsing the reference report and diffing its errors also needs to be repeated every time the list of new errors is needed. Both of these have a significant impact on the JobDetails page load time. So this patch lets the task scripts (WineRun*) extract the log file errors when they complete, detect the new errors, and saves the result in a .errors file stored next to the original log file. All that's needed then is to read the small .errors file to get the full errors list along with their status (old or new) which speeds up WineSendLog and JobDetails. However the task scripts cannot generate the errors cache file for the testbot.log file because that file is complete only once the task scripts exits. So the errors cache file for it is generated by the WineSendLog script once the job completes. Furthermore the .err files were used to store the validation errors detected by the ParseWineTestReport() function. These are now stored as the '.Extra' error group in the .errors files, making the .err files redundant. Then instead of showing the content of the xxx and xxx.err file in succession, the scripts either just iterate over all the error groups, or present the full content of the log first and then show the 'extra' error groups, that is those that are not tied to a specific log line number. Note: This requires running UpdateTaskLogs to create the new .errors files and to delete the obsolete .err files. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48035 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 2 +- testbot/bin/UpdateTaskLogs | 136 ++++++++++------- testbot/bin/WineRunBuild.pl | 2 + testbot/bin/WineRunReconfig.pl | 2 + testbot/bin/WineRunTask.pl | 17 ++- testbot/bin/WineRunWineTest.pl | 16 +- testbot/bin/WineSendLog.pl | 111 +++++++++----- testbot/lib/WineTestBot/LogUtils.pm | 275 +++++++++++++++++++++++++++++----- testbot/lib/WineTestBot/StepsTasks.pm | 7 - testbot/lib/WineTestBot/Tasks.pm | 4 + testbot/web/JobDetails.pl | 91 +++++------ 11 files changed, 445 insertions(+), 218 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=99dbbf84b0191d0827a…

1 0

Francois Gouget : testbot/WineRun*: Don't abort and retry if ParseTaskLog() fails.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: tools Branch: master Commit: 37157577717d7d5dcc82cc30e3e3ec3c0d5ad207 URL: https://source.winehq.org/git/tools.git/?a=commit;h=37157577717d7d5dcc82cc3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Feb 9 18:44:27 2020 +0100 testbot/WineRun*: Don't abort and retry if ParseTaskLog() fails. It makes sense to retry if retrieving Task.log fails because it may be caused by a temporary network issue. But ParseTaskLog() would only fail if there is a bug or the TestBot was set up wrong. Since retrying would not help it is better to simply report the error. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 2 +- testbot/bin/WineRunReconfig.pl | 2 +- testbot/bin/WineRunWineTest.pl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index e7a90aa..2764ffc 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -435,7 +435,7 @@ if ($TA->GetFile("Build.log", "$TaskDir/task.log")) } elsif (defined $LogInfo->{BadLog}) { - FatalError("$LogInfo->{BadLog}\n", "retry"); + # Let CreateLogErrorsCache() report it } else { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index d854048..897b675 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -430,7 +430,7 @@ if ($TA->GetFile("Reconfig.log", "$TaskDir/task.log")) } elsif (defined $LogInfo->{BadLog}) { - FatalError("$LogInfo->{BadLog}\n", "retry"); + # Let CreateLogErrorsCache() report it } else { diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index c35d6c0..f6e6c97 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -525,7 +525,7 @@ if ($TA->GetFile("Task.log", "$TaskDir/task.log")) } elsif (defined $LogInfo->{BadLog}) { - FatalError("$LogInfo->{BadLog}\n", "retry"); + # Let CreateLogErrorsCache() report it } elsif ($LogInfo->{Type} eq "build") {

1 0

Jeremy Newman : wineconf 2020 hosting
by Jeremy Newman 10 Feb '20

10 Feb '20

Module: website Branch: master Commit: e207c764fd635e3c06206c3507033128b9164c65 URL: https://source.winehq.org/git/website.git/?a=commit;h=e207c764fd635e3c06206… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Feb 10 09:17:57 2020 -0600 wineconf 2020 hosting --- templates/en/home.template | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/templates/en/home.template b/templates/en/home.template index cc8d5de9..75db7fdc 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -75,7 +75,7 @@ <div class="item"> <img src="https://appdb.winehq.org/images/metatrader5.jpg" alt="Twelfth slide"> </div> - </div> + </div> <a class="left carousel-control" href="#carouselScreenshots" data-slide="prev"> <span class="glyphicon glyphicon-chevron-left"></span> <span class="sr-only">Previous</span> @@ -159,7 +159,23 @@ <div class="whq-page-container margin-top-md"> - <h1 class="title"><a href="{$root}/news">News and Updates</a></h1> + <h2 class="title"><a href="http://wiki.winehq.org/Organising_WineConf">WineConf Call for Hosts</a></h2> + + <p>This is a call for proposals to host the next WineConf sometime this year. Ideally proposals would present;</p> + + <ul> + <li>Proposed dates</li> + <li>Proposed city</li> + <li>Information on potential venues and travel</li> + </ul> + + <p>We'll need to choose a host relatively quickly as it does take time to plan and book the event. I'm hoping we can settle on a host by the end of February but ultimately that decision goes to the Wine Committee. Questions, comments, concerns can be posted on the <a href="{$root}/forums">WineConf mailing list</a>. A draft of a guide to hosting has been started on the wiki [1]. Please take a look to get a sense of what is involved in hosting the conference.</p> + + <p>1. <a href="https://wiki.winehq.org/Organising_WineConf">https://wiki.winehq.org/Organising_WineConf</a></p> + + <br> + + <h2 class="title"><a href="{$root}/news">News and Updates</a></h2>

1 0