February 2020 - Wine-Commits

Brendan Shanks : include: Fix size of tomConstants enum.
by Alexandre Julliard Feb. 12, 2020

Feb. 12, 2020

Module: wine Branch: master Commit: 0e408452a4fa8b4b1e02ec4bb16cba6822200b61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e408452a4fa8b4b1e02ec4b… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Feb 11 15:55:53 2020 -0800 include: Fix size of tomConstants enum. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48577 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/tom.idl | 342 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 171 insertions(+), 171 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0e408452a4fa8b4b1e02…

1 0

Kevin Puetz : include: Introduce WINE_UNICODE_CHAR16 that allows using char16_t as Windows WCHAR.
by Alexandre Julliard Feb. 12, 2020

Feb. 12, 2020

Module: wine Branch: master Commit: c2679945dd1ffddbc8e8a43dc7263be7738d4a4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2679945dd1ffddbc8e8a43d… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Tue Feb 11 19:52:22 2020 +0100 include: Introduce WINE_UNICODE_CHAR16 that allows using char16_t as Windows WCHAR. This is useful for winelib applications that don't use -fshort-wchar. They may use u"" for string literals and u16string. However, C++ has builtin char16_t type, so we need WCHAR to be compatible with that. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sqltypes.h | 4 +++- include/tchar.h | 4 +++- include/winnt.h | 9 ++++++--- include/winnt.rh | 6 ++++-- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/include/sqltypes.h b/include/sqltypes.h index 4f3f8fe9f1..0923f6b362 100644 --- a/include/sqltypes.h +++ b/include/sqltypes.h @@ -28,8 +28,10 @@ extern "C" { #endif typedef unsigned char SQLCHAR; -#ifdef WINE_UNICODE_NATIVE +#if defined(WINE_UNICODE_NATIVE) typedef wchar_t SQLWCHAR; +#elif defined(WINE_UNICODE_CHAR16) +typedef char16_t SQLWCHAR; #else typedef unsigned short SQLWCHAR; #endif diff --git a/include/tchar.h b/include/tchar.h index 5234a70bd9..d5e4983756 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -244,8 +244,10 @@ typedef unsigned short wctype_t; #endif #ifndef __TCHAR_DEFINED -#ifdef WINE_UNICODE_NATIVE +#if defined(WINE_UNICODE_NATIVE) typedef wchar_t _TCHAR; +#elif defined(WINE_UNICODE_CHAR16) +typedef char16_t _TCHAR; #else typedef unsigned short _TCHAR; #endif diff --git a/include/winnt.h b/include/winnt.h index adc5d3d686..adb7ef5669 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -463,11 +463,14 @@ typedef int LONG, *PLONG; #endif /* Some systems might have wchar_t, but we really need 16 bit characters */ -#ifdef WINE_UNICODE_NATIVE -typedef wchar_t WCHAR, *PWCHAR; +#if defined(WINE_UNICODE_NATIVE) +typedef wchar_t WCHAR; +#elif defined(WINE_UNICODE_CHAR16) +typedef char16_t WCHAR; #else -typedef unsigned short WCHAR, *PWCHAR; +typedef unsigned short WCHAR; #endif +typedef WCHAR *PWCHAR; typedef ULONG UCSCHAR; #define MIN_UCSCHAR (0) diff --git a/include/winnt.rh b/include/winnt.rh index 59791bc996..786a38f326 100644 --- a/include/winnt.rh +++ b/include/winnt.rh @@ -24,10 +24,12 @@ * macro which only exists in the user's code. */ #ifndef WINE_NO_UNICODE_MACROS -# ifdef UNICODE +# ifndef UNICODE +# define __TEXT(string) string +# elif defined(WINE_UNICODE_NATIVE) # define __TEXT(string) L##string # else -# define __TEXT(string) string +# define __TEXT(string) u##string # endif # define TEXT(string) __TEXT(string) #endif

1 0

Alexandre Julliard : wmc: Add --nls-dir option.
by Alexandre Julliard Feb. 12, 2020

Feb. 12, 2020

Module: wine Branch: master Commit: a4fc84bd4d37ca2f1cd73f33cff1af71e065cc23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4fc84bd4d37ca2f1cd73f33… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 12 09:03:57 2020 +0100 wmc: Add --nls-dir option. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/Makefile.in | 4 ++++ tools/wmc/wmc.c | 35 +++++++++++++++++++++++++++++++++++ tools/wmc/wmc.h | 2 ++ tools/wmc/wmc.man.in | 7 ++++--- 4 files changed, 45 insertions(+), 3 deletions(-) diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index a97da85ea3..660bc940f4 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -11,6 +11,10 @@ C_SRCS = \ BISON_SRCS = mcy.y +wmc_EXTRADEFS = \ + -DNLSDIR="\"${nlsdir}\"" \ + -DBIN_TO_NLSDIR=\"`$(MAKEDEP) -R ${bindir} ${nlsdir}`\" + EXTRALIBS = $(GETTEXTPO_LIBS) INSTALL_DEV = $(PROGRAMS) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index 057b9eef03..3b93fed40e 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -50,6 +50,7 @@ static const char usage[] = " -h, --help Print this message\n" " -H FILE Write header file to FILE (default is inputfile.h)\n" " -i Inline messagetable(s)\n" + " --nls-dir=DIR Directory containing the NLS codepage mappings\n" " -o, --output=FILE Output to FILE (default is infile.rc)\n" " -O, --output-format=FORMAT The output format (`rc', `res', or `pot')\n" " -P, --po-dir=DIR Directory containing po files for translations\n" @@ -109,6 +110,8 @@ char *output_name = NULL; /* The name given by the -o option */ char *input_name = NULL; /* The name given on the command-line */ char *header_name = NULL; /* The name given by the -H option */ +const char *nlsdirs[3] = { NULL, NLSDIR, NULL }; + int line_number = 1; /* The current line */ int char_number = 1; /* The current char pos within the line */ @@ -127,10 +130,16 @@ static enum FORMAT_POT } output_format; +enum long_options_values +{ + LONG_OPT_NLS_DIR = 1, +}; + static const char short_options[] = "B:cdDhH:io:O:P:uUvVW"; static const struct option long_options[] = { { "help", 0, NULL, 'h' }, + { "nls-dir", 1, NULL, LONG_OPT_NLS_DIR }, { "output", 1, NULL, 'o' }, { "output-format", 1, NULL, 'O' }, { "pedantic", 0, NULL, 'W' }, @@ -151,6 +160,28 @@ static void exit_on_signal( int sig ) exit(1); /* this will call the atexit functions */ } +static void init_argv0_dir( const char *argv0 ) +{ +#ifndef _WIN32 + char *p, *dir; + +#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) + dir = realpath( "/proc/self/exe", NULL ); +#elif defined (__FreeBSD__) || defined(__DragonFly__) + dir = realpath( "/proc/curproc/file", NULL ); +#else + dir = realpath( argv0, NULL ); +#endif + if (!dir) return; + if (!(p = strrchr( dir, '/' ))) return; + if (p == dir) p++; + *p = 0; + if (strendswith( dir, "/tools/wmc" )) nlsdirs[0] = strmake( "%s/../../nls", dir ); + else nlsdirs[0] = strmake( "%s/%s", dir, BIN_TO_NLSDIR ); + free( dir ); +#endif +} + int main(int argc,char *argv[]) { int optc; @@ -167,6 +198,7 @@ int main(int argc,char *argv[]) #ifdef SIGHUP signal( SIGHUP, exit_on_signal ); #endif + init_argv0_dir( argv[0] ); /* First rebuild the commandline to put in destination */ /* Could be done through env[], but not all OS-es support it */ @@ -257,6 +289,9 @@ int main(int argc,char *argv[]) case 'W': pedantic = 1; break; + case LONG_OPT_NLS_DIR: + nlsdirs[0] = xstrdup( optarg ); + break; default: lose++; break; diff --git a/tools/wmc/wmc.h b/tools/wmc/wmc.h index 441072b3f7..ae3a1dc1d3 100644 --- a/tools/wmc/wmc.h +++ b/tools/wmc/wmc.h @@ -49,6 +49,8 @@ extern char *input_name; extern char *header_name; extern char *cmdline; +extern const char *nlsdirs[]; + extern int line_number; extern int char_number; diff --git a/tools/wmc/wmc.man.in b/tools/wmc/wmc.man.in index 03f99acfee..123af446a5 100644 --- a/tools/wmc/wmc.man.in +++ b/tools/wmc/wmc.man.in @@ -45,6 +45,10 @@ Inline messagetable(s). This option skips the generation of all \fI.bin\fR files and writes all output into the \fI.rc\fR file. This encoding is parsable with wrc(1). .TP +.BI \-\-nls-dir= directory +Specify the directory to search for the NLS files containing the +codepage mapping tables. +.TP .BR \-o ,\ \-\-output =\fIfile Output to \fIfile\fR. Default is \fIinputfile.rc\fR. .TP @@ -94,9 +98,6 @@ The message compiler should be able to have multiple input files and combine them into one output file. This would enable the splitting of languages into separate files. .PP -Unicode detection of the input is suboptimal, to say the least. It should -recognize byte order marks (BOM) and decide what to do. -.PP Decimal output is completely lacking. Don't know whether it should be implemented because it is a, well, non-informative format change. It is recognized on the commandline for some form of compatibility.

1 0

Alexandre Julliard : wrc: Add --nls-dir option.
by Alexandre Julliard Feb. 12, 2020

Feb. 12, 2020

Module: wine Branch: master Commit: 64ff68c8847adb230beca184195a66d424f3dfa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64ff68c8847adb230beca184… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 12 09:03:51 2020 +0100 wrc: Add --nls-dir option. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/Makefile.in | 2 ++ tools/wrc/wrc.c | 9 +++++++++ tools/wrc/wrc.h | 2 ++ tools/wrc/wrc.man.in | 4 ++++ 4 files changed, 17 insertions(+) diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index c81276ebc6..f68081847e 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -16,7 +16,9 @@ LEX_SRCS = parser.l BISON_SRCS = parser.y wrc_EXTRADEFS = \ + -DNLSDIR="\"${nlsdir}\"" \ -DINCLUDEDIR="\"${includedir}\"" \ + -DBIN_TO_NLSDIR=\"`$(MAKEDEP) -R ${bindir} ${nlsdir}`\" \ -DBIN_TO_INCLUDEDIR=\"`$(MAKEDEP) -R ${bindir} ${includedir}`\" EXTRALIBS = $(GETTEXTPO_LIBS) -lwpp diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index f81fe7baa6..6c1887a788 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -66,6 +66,7 @@ static const char usage[] = " -J, --input-format=FORMAT The input format (either `rc' or `rc16')\n" " -l, --language=LANG Set default language to LANG (default is neutral {0, 0})\n" " -m16, -m32, -m64 Build for 16-bit, 32-bit resp. 64-bit platforms\n" + " --nls-dir=DIR Directory containing the NLS codepage mappings\n" " --no-use-temp-file Ignored for compatibility with windres\n" " --nostdinc Disables searching the standard include path\n" " -o, --output=FILE Output to file (default is infile.res)\n" @@ -157,6 +158,7 @@ char *input_name = NULL; /* The name given on the command-line */ static char *temp_name = NULL; /* Temporary file for preprocess pipe */ static const char *includedir; +const char *nlsdirs[3] = { NULL, NLSDIR, NULL }; int line_number = 1; /* The current line */ int char_number = 1; /* The current char pos within the line */ @@ -175,6 +177,7 @@ enum long_options_values LONG_OPT_NOSTDINC = 1, LONG_OPT_TMPFILE, LONG_OPT_NOTMPFILE, + LONG_OPT_NLS_DIR, LONG_OPT_PO_DIR, LONG_OPT_PREPROCESSOR, LONG_OPT_SYSROOT, @@ -196,6 +199,7 @@ static const struct option long_options[] = { { "input", 1, NULL, 'i' }, { "input-format", 1, NULL, 'J' }, { "language", 1, NULL, 'l' }, + { "nls-dir", 1, NULL, LONG_OPT_NLS_DIR }, { "no-use-temp-file", 0, NULL, LONG_OPT_NOTMPFILE }, { "nostdinc", 0, NULL, LONG_OPT_NOSTDINC }, { "output", 1, NULL, 'o' }, @@ -349,6 +353,8 @@ static void init_argv0_dir( const char *argv0 ) if (p == dir) p++; *p = 0; includedir = strmake( "%s/%s", dir, BIN_TO_INCLUDEDIR ); + if (strendswith( dir, "/tools/wrc" )) nlsdirs[0] = strmake( "%s/../../nls", dir ); + else nlsdirs[0] = strmake( "%s/%s", dir, BIN_TO_NLSDIR ); free( dir ); #endif } @@ -408,6 +414,9 @@ int main(int argc,char *argv[]) case LONG_OPT_NOTMPFILE: if (debuglevel) warning("--no-use-temp-file option not yet supported, ignored.\n"); break; + case LONG_OPT_NLS_DIR: + nlsdirs[0] = xstrdup( optarg ); + break; case LONG_OPT_PO_DIR: po_dir = xstrdup( optarg ); break; diff --git a/tools/wrc/wrc.h b/tools/wrc/wrc.h index 9664dd0392..24b0e28904 100644 --- a/tools/wrc/wrc.h +++ b/tools/wrc/wrc.h @@ -45,6 +45,8 @@ extern int check_utf8; extern char *input_name; extern char *cmdline; +extern const char *nlsdirs[]; + extern int line_number; extern int char_number; diff --git a/tools/wrc/wrc.man.in b/tools/wrc/wrc.man.in index 24dca04902..e3ad8fca4d 100644 --- a/tools/wrc/wrc.man.in +++ b/tools/wrc/wrc.man.in @@ -80,6 +80,10 @@ Generate resources for 16-bit, 32-bit or 64-bit platforms respectively. The only difference between 32-bit and 64-bit is whether the _WIN64 preprocessor symbol is defined. .TP +.I \fB\-\-nls-dir=\fIdir\fR +Specify the directory to search for the NLS files containing the +codepage mapping tables. +.TP .I \fB\-\-nostdinc\fR Do not search the standard include path, look for include files only in the directories explicitly specified with the \fB\-I\fR option.

1 0

Derek Lesho : mfplat: Implement IMFByteStream::SetCurrentPosition() for file streams.
by Alexandre Julliard Feb. 12, 2020

Feb. 12, 2020

Module: wine Branch: master Commit: 37d977da22eaf8959d795ad8b1dcf84a18ba250d URL: https://source.winehq.org/git/wine.git/?a=commit;h=37d977da22eaf8959d795ad8… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Wed Feb 12 08:46:37 2020 +0300 mfplat: Implement IMFByteStream::SetCurrentPosition() for file streams. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 50 +++++++++++++++++++++------------------------- dlls/mfplat/tests/mfplat.c | 20 ++++++++++++++++++- 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 1ebd443131..ef0db5a276 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -3287,22 +3287,18 @@ static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) return E_NOTIMPL; } -static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) +static HRESULT WINAPI bytestream_file_GetCurrentPosition(IMFByteStream *iface, QWORD *position) { - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p\n", This, position); + struct bytestream *stream = impl_from_IMFByteStream(iface); - return E_NOTIMPL; -} + TRACE("%p, %p.\n", iface, position); -static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); + if (!position) + return E_INVALIDARG; - FIXME("%p, %s\n", This, wine_dbgstr_longlong(position)); + *position = stream->position; - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI bytestream_file_GetLength(IMFByteStream *iface, QWORD *length) @@ -3445,6 +3441,19 @@ static HRESULT WINAPI mfbytestream_Close(IMFByteStream *iface) return E_NOTIMPL; } +static HRESULT WINAPI bytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) +{ + struct bytestream *stream = impl_from_IMFByteStream(iface); + + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(position)); + + EnterCriticalSection(&stream->cs); + stream->position = position; + LeaveCriticalSection(&stream->cs); + + return S_OK; +} + static const IMFByteStreamVtbl bytestream_file_vtbl = { bytestream_QueryInterface, @@ -3453,8 +3462,8 @@ static const IMFByteStreamVtbl bytestream_file_vtbl = bytestream_GetCapabilities, bytestream_file_GetLength, mfbytestream_SetLength, - mfbytestream_GetCurrentPosition, - mfbytestream_SetCurrentPosition, + bytestream_file_GetCurrentPosition, + bytestream_SetCurrentPosition, bytestream_file_IsEndOfStream, bytestream_file_Read, bytestream_BeginRead, @@ -3512,19 +3521,6 @@ static HRESULT WINAPI bytestream_stream_GetCurrentPosition(IMFByteStream *iface, return S_OK; } -static HRESULT WINAPI bytestream_stream_SetCurrentPosition(IMFByteStream *iface, QWORD position) -{ - struct bytestream *stream = impl_from_IMFByteStream(iface); - - TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(position)); - - EnterCriticalSection(&stream->cs); - stream->position = position; - LeaveCriticalSection(&stream->cs); - - return S_OK; -} - static HRESULT WINAPI bytestream_stream_IsEndOfStream(IMFByteStream *iface, BOOL *ret) { struct bytestream *stream = impl_from_IMFByteStream(iface); @@ -3642,7 +3638,7 @@ static const IMFByteStreamVtbl bytestream_stream_vtbl = bytestream_stream_GetLength, bytestream_stream_SetLength, bytestream_stream_GetCurrentPosition, - bytestream_stream_SetCurrentPosition, + bytestream_SetCurrentPosition, bytestream_stream_IsEndOfStream, bytestream_stream_Read, bytestream_BeginRead, diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 7ec0b01982..67123d0b69 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1340,15 +1340,16 @@ static void test_MFCreateMFByteStreamOnStream(void) static void test_file_stream(void) { IMFByteStream *bytestream, *bytestream2; + QWORD bytestream_length, position; IMFAttributes *attributes = NULL; MF_ATTRIBUTE_TYPE item_type; - QWORD bytestream_length; WCHAR pathW[MAX_PATH]; DWORD caps, count; WCHAR *filename; IUnknown *unk; HRESULT hr; WCHAR *str; + BOOL eos; static const WCHAR newfilename[] = {'n','e','w','.','m','p','4',0}; @@ -1415,6 +1416,23 @@ static void test_file_stream(void) ok(hr == S_OK, "Failed to get bytestream length, hr %#x.\n", hr); ok(bytestream_length > 0, "Unexpected bytestream length %s.\n", wine_dbgstr_longlong(bytestream_length)); + hr = IMFByteStream_SetCurrentPosition(bytestream, bytestream_length); + ok(hr == S_OK, "Failed to set bytestream position, hr %#x.\n", hr); + + hr = IMFByteStream_IsEndOfStream(bytestream, &eos); + ok(hr == S_OK, "Failed query end of stream, hr %#x.\n", hr); + ok(eos == TRUE, "Unexpected IsEndOfStream result, %u.\n", eos); + + hr = IMFByteStream_SetCurrentPosition(bytestream, 2 * bytestream_length); + ok(hr == S_OK, "Failed to set bytestream position, hr %#x.\n", hr); + + hr = IMFByteStream_GetCurrentPosition(bytestream, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFByteStream_GetCurrentPosition(bytestream, &position); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(position == 2 * bytestream_length, "Unexpected position.\n"); + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream2); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Francois Gouget : testbot/Janitor: Avoid false positives when cleaning up staging.
by Alexandre Julliard Feb. 12, 2020

Feb. 12, 2020

Module: tools Branch: master Commit: 9d6a892b99a8757ccc8118bcfa4d782e5f1f4264 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9d6a892b99a8757ccc8118b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 12 16:02:00 2020 +0100 testbot/Janitor: Avoid false positives when cleaning up staging. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 0635b37..8d50349 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -273,10 +273,23 @@ if (opendir(my $dh, "$DataDir/staging")) if ($Entry =~ /^[0-9a-f]{32}-websubmit2?_/) { - # These files always expire after one day + # We get these files whenever a developer abandons a job submission. + # So just delete them silently after a day. $TTL = 1 - $Age; } - elsif ($Entry !~ /^[0-9a-f]{32}_(?:patch\.diff|patchset\.diff|email|winetest(?:64)?-latest\.exe|work)$/) + elsif ($Entry =~ /^[0-9a-f]{32}_(?:patch\.diff|patchset\.diff|email|winetest(?:64)?-latest\.exe|work)$/) + { + # Janitor can only see these files if it ran during the brief interval + # between their creation and them being moved out of staging, or if + # something prevented the latter (power loss, bug, etc). So only complain + # after a day to avoid false positives. + if ($TTL >= 1) + { + my $Deletion = defined $TTL ? " (deletion in $TTL days)" : ""; + Error "Found an old transient file$Deletion: staging/$Entry\n" + } + } + else { my $Deletion = defined $TTL ? " (deletion in $TTL days)" : ""; Error "Found a suspicious file$Deletion: staging/$Entry\n";

1 0

Francois Gouget : testbot/LogUtils: Share code between _SaveLogErrors() and _DumpErrors().
by Alexandre Julliard Feb. 12, 2020

Feb. 12, 2020

Module: tools Branch: master Commit: 0cbb595564267b66cd7dcfeb9316a48ce286582f URL: https://source.winehq.org/git/tools.git/?a=commit;h=0cbb595564267b66cd7dcfe… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 12 16:02:11 2020 +0100 testbot/LogUtils: Share code between _SaveLogErrors() and _DumpErrors(). _SaveLogErrors() provides more details about the errors than the old _DumpErrors() code did. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 90 ++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 51 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 9bde76c..a5c6217 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -687,24 +687,6 @@ sub GetLogLabel($) return defined $Label ? sprintf($Label, $Extra) : $LogFileName; } - -sub _DumpErrors($$) -{ - my ($Label, $LogInfo) = @_; - - print STDERR "$Label: ", join(" ", keys %$LogInfo), "\n"; - my $GroupNames = $LogInfo->{ErrGroupNames}; - print STDERR " Groups=", scalar(@$GroupNames), " [", join(",", @$GroupNames), "]\n"; - my @ErrorKeys = sort keys %{$LogInfo->{Groups}}; - print STDERR " Errors=", scalar(@ErrorKeys), " [", join(",", @ErrorKeys), "]\n"; - foreach my $GroupName (@$GroupNames) - { - print STDERR " [$GroupName]\n"; - my $Group = $LogInfo->{Groups}->{$GroupName}; - print STDERR " [$_]\n" for (@{$Group->{Errors}}); - } -} - sub _AddLogGroup($$;$) { my ($LogInfo, $GroupName, $LineNo) = @_; @@ -859,21 +841,7 @@ sub GetLogErrors($) Loads the specified log errors file. -The file contains two types of lines: -* GroupName lines - <GroupName> - Where <GroupName> is a unique string which would typically be the name of a - WineTest dll or program, but may also be empty or be used to specify an - extra group errors. It must not start with a space. - -* Error lines - <Space> <New> <SrcLineNo> <Error> - Where: - - <Space> is a space, as well as the spaces in the line above. - - <New> is either 'n' for new errors, or 'o' for old ones. - - <SrcLineNo> is the 1-base line number of the error in the source log file. - If there is no source line then this should be 0. - - <Error> is the error message. +See _WriteLogErrors() for the format of the errors file. Returns the errors in the same format as TagNewErrors(). @@ -949,11 +917,11 @@ sub LoadLogErrors($) =pod =over 12 -=item C<_SaveLogErrors()> +=item C<_WriteLogErrors()> -Saves the LogInfo structure to <LogName>.errors. +Writes the LogInfo structure in text form to the specified file descriptor. -The file contains lines of the form: +All lines follow are of the following form: <type> <value1> <value2> The values depend on the <type> of the line. <type> and <value1> must not @@ -984,6 +952,27 @@ different type. =back =cut +sub _WriteLogErrors($$) +{ + my ($Fh, $LogInfo) = @_; + + foreach my $Name ("BadRef", "NoRef") + { + next if (!defined $LogInfo->{$Name}); + print $Fh "p $Name $LogInfo->{$Name}\n"; + } + foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) + { + my $Group = $LogInfo->{ErrGroups}->{$GroupName}; + print $Fh "g $Group->{LineNo} $GroupName\n"; + foreach my $Index (0..@{$Group->{Errors}} - 1) + { + my $IsNew = $Group->{IsNew}->[$Index] ? "n" : "o"; + print $Fh "$IsNew $Group->{LineNos}->[$Index] $Group->{Errors}->[$Index]\n"; + } + } +} + sub _SaveLogErrors($) { my ($LogInfo) = @_; @@ -991,21 +980,7 @@ sub _SaveLogErrors($) my $ErrorsPath = "$LogInfo->{LogPath}.errors"; if (open(my $ErrorsFile, ">", $ErrorsPath)) { - foreach my $Name ("BadRef", "NoRef") - { - next if (!defined $LogInfo->{$Name}); - print $ErrorsFile "p $Name $LogInfo->{$Name}\n"; - } - foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) - { - my $Group = $LogInfo->{ErrGroups}->{$GroupName}; - print $ErrorsFile "g $Group->{LineNo} $GroupName\n"; - foreach my $Index (0..@{$Group->{Errors}} - 1) - { - my $IsNew = $Group->{IsNew}->[$Index] ? "n" : "o"; - print $ErrorsFile "$IsNew $Group->{LineNos}->[$Index] $Group->{Errors}->[$Index]\n"; - } - } + _WriteLogErrors($ErrorsFile, $LogInfo); close($ErrorsFile); # Set the mtime so Janitor reaps both at the same time @@ -1015,6 +990,19 @@ sub _SaveLogErrors($) return "Could not open '$LogInfo->{LogName}.errors' for writing: $!"; } +sub _DumpErrors($$) +{ + my ($Label, $LogInfo) = @_; + + print STDERR "$Label:\n"; + foreach my $Key (sort keys %{$LogInfo}) + { + next if ($Key =~ /^(?:ErrGroupNames|ErrGroups|NewCount)$/); + print STDERR "+ $Key $LogInfo->{$Key}\n"; + } + _WriteLogErrors(*STDERR, $LogInfo); +} + # # New error detection

1 0

Francois Gouget : testbot/JobDetails: Improve the error reporting.
by Alexandre Julliard Feb. 12, 2020

Feb. 12, 2020

Module: tools Branch: master Commit: db7c14c09529b4b0a519fa91ba0e9fa28fd79fdb URL: https://source.winehq.org/git/tools.git/?a=commit;h=db7c14c09529b4b0a519fa9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 12 16:02:37 2020 +0100 testbot/JobDetails: Improve the error reporting. Clearly indicate when the log or its errors cache could not be read. Also show a note when new errors could not be detected, either because there is no reference WineTest results (which would typically happen shortly after a new test configuration has been added), or because there was an issue reading one or more of the reference reports. And don't claim there are no errors when the task has not run yet. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 59 +++++++++++++++++++++++++++++++++++++++------ testbot/web/WineTestBot.css | 1 + 2 files changed, 53 insertions(+), 7 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index ccf3410..5a484da 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -351,6 +351,22 @@ sub GenerateFullLog($$$$) my ($self, $Dir, $LogName, $HideLog) = @_; my $LogInfo = LoadLogErrors("$Dir/$LogName"); + if (defined $LogInfo->{BadLog}) + { + print "<pre class='log-note'>Could not highlight new errors: ", ($LogInfo->{BadRef} || $LogInfo->{BadLog}), "</pre>\n"; + } + elsif ($LogInfo->{NoRef} and !defined $LogInfo->{BadRef}) + { + print "<pre class='log-note'>No WineTest results are available to detect new errors</pre>\n"; + } + elsif ($LogInfo->{NoRef}) + { + print "<pre class='log-note'>Could not detect new errors: $LogInfo->{BadRef}</pre>\n"; + } + elsif (defined $LogInfo->{BadRef}) + { + print "<pre class='log-note'>Some WineTest results could not be used to detect new errors: $LogInfo->{BadRef}</pre>\n"; + } my %NewLineNos; if ($LogInfo->{ErrCount}) @@ -397,6 +413,11 @@ sub GenerateFullLog($$$$) } close($LogFile); } + else + { + print "<pre class='log-error'><code>Unable to open '$LogName' for reading: $!</code></pre>\n"; + $IsEmpty = 0; + } # And append the extra errors foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) @@ -535,16 +556,18 @@ EOF { next if ($LogName =~ /^old_/); my $LogInfo = LoadLogErrors("$TaskDir/$LogName"); - next if (!$LogInfo->{ErrCount}); - $LogInfos->{$LogName} = $LogInfo; + if ($LogInfo->{ErrCount} or defined $LogInfo->{BadLog}) + { + $LogInfos->{$LogName} = $LogInfo; + } } my $ShowLogName = ($ReportCount > 1 or scalar(keys %$LogInfos) > 1); - my $LogIsEmpty = 1; + my $NoErrors = 1; foreach my $LogName (@{$MoreInfo->{Logs}}) { next if (!$LogInfos->{$LogName}); - $LogIsEmpty = 0; + $NoErrors = 0; if ($ShowLogName) { @@ -554,6 +577,24 @@ EOF } my $LogInfo = $LogInfos->{$LogName}; + if (defined $LogInfo->{BadLog}) + { + my ($_Action, $Url) = $self->GetMoreInfoLink($Key, GetLogLabel($LogName), "Full", $LogName); + print "<pre class='log-note'>The error summary is not available (<a href='$Url'>see full log instead</a>): $LogInfo->{BadLog}</pre>\n"; + } + elsif ($LogInfo->{NoRef} and !defined $LogInfo->{BadRef}) + { + print "<pre class='log-note'>No WineTest results are available to detect new errors</pre>\n"; + } + elsif ($LogInfo->{NoRef}) + { + print "<pre class='log-note'>Could not detect new errors: $LogInfo->{BadRef}</pre>\n"; + } + elsif (defined $LogInfo->{BadRef}) + { + print "<pre class='log-note'>Some WineTest results could not be used to detect new errors: $LogInfo->{BadRef}</pre>\n"; + } + foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { print "<div class='LogDllName'>$GroupName</div>\n" if ($GroupName); @@ -576,9 +617,9 @@ EOF print "</code></pre>\n"; } } - - if ($LogIsEmpty) + if (!@{$MoreInfo->{Logs}}) { + # There is no log file or they are all empty if ($StepTask->Status eq "canceled") { print "No log, task was canceled\n"; @@ -589,9 +630,13 @@ EOF } else { - print "No errors\n"; + print "<pre class='log-note'>No result yet...</pre>\n"; } } + elsif ($NoErrors) + { + print "No errors\n"; + } } } print "</div>\n"; diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 9a23f5f..3fccbd2 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -395,6 +395,7 @@ pre .userdisabled { color: red; } .userdeleted { color: red; } +.log-note { font-style: italic; color: blue; } .log-info { background-color: #d9ffcc; } .log-skip { color: blue; } .log-todo { color: #d08000; }

1 0

Francois Gouget : testbot: Identify testbot.log information and error messages.
by Alexandre Julliard Feb. 12, 2020

Feb. 12, 2020

Module: tools Branch: master Commit: 9d5bd059a2e4fa4597c3f7ce3c8104f5ba64fd29 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9d5bd059a2e4fa4597c3f7c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 12 16:02:41 2020 +0100 testbot: Identify testbot.log information and error messages. The testbot.log error messages have no common prefix such as 'error:' which makes them hard to identify. Expand GetLogLineCategory() to identify the most important ones. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index a5c6217..2104ffa 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -86,7 +86,11 @@ sub GetLogLineCategory($) $Line =~ /^\+ \S/ or $Line =~ /^LANG=/ or $Line =~ /^Running (?:the tests|WineTest) / or - $Line =~ /^Task: (?:ok|tests|Updated)/) + $Line =~ /^Task: (?:ok|tests|Updated)/ or + # testbot.log information messages + $Line =~ /^----- Run / or + $Line =~ /^The test VM has crashed/ or # Context for an error message + $Line =~ /^The previous \d+ run$s$ terminated abnormally/) { return "info"; } @@ -101,7 +105,12 @@ sub GetLogLineCategory($) $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or $Line =~ /^Task: / or # Typical perl errors - _IsPerlError($Line)) + _IsPerlError($Line) or + # The main testbot.log errors + $Line =~ /^An error occurred while / or + $Line =~ /^Could not create / or + $Line =~ /^Giving up after \d+ run$s$$/ or + $Line =~ /^The (?:build|task) timed out$/) { return "error"; }

1 0

Rémi Bernon : shell32/tests: Fix some format-overflow warnings.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: d1373e8aae1b15b96e847488e4b6617789f8fb62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1373e8aae1b15b96e847488… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 11 19:09:30 2020 +0100 shell32/tests: Fix some format-overflow warnings. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 12ef18c1d8..030ab54525 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1096,7 +1096,7 @@ static filename_tests_t noquotes_tests[]= static void test_lpFile_parsed(void) { - char fileA[MAX_PATH]; + char fileA[MAX_PATH + 38]; INT_PTR rc; if (skip_shlexec_tests) @@ -1549,7 +1549,7 @@ static const argify_tests_t argify_tests[] = static void test_argify(void) { - char fileA[MAX_PATH], params[2*MAX_PATH+12]; + char fileA[MAX_PATH + 18], params[2 * MAX_PATH + 28]; INT_PTR rc; const argify_tests_t* test; const char *bad; @@ -1607,7 +1607,7 @@ static void test_argify(void) static void test_filename(void) { - char filename[MAX_PATH]; + char filename[MAX_PATH + 20]; const filename_tests_t* test; char* c; INT_PTR rc; @@ -1647,7 +1647,7 @@ static void test_filename(void) } else { - char quoted[MAX_PATH + 2]; + char quoted[MAX_PATH + 22]; quotedfile = TRUE; sprintf(quoted, "\"%s\"", filename); @@ -1873,7 +1873,7 @@ static void test_fileurls(void) static void test_urls(void) { - char url[MAX_PATH]; + char url[MAX_PATH + 15]; INT_PTR rc; if (!create_test_class("fakeproto", FALSE)) @@ -1968,7 +1968,7 @@ static void test_urls(void) static void test_find_executable(void) { char notepad_path[MAX_PATH]; - char filename[MAX_PATH]; + char filename[MAX_PATH + 17]; char command[MAX_PATH]; const filename_tests_t* test; INT_PTR rc; @@ -2114,8 +2114,8 @@ static filename_tests_t lnk_tests[]= static void test_lnks(void) { - char filename[MAX_PATH]; - char params[MAX_PATH]; + char filename[MAX_PATH + 26]; + char params[MAX_PATH + 18]; const filename_tests_t* test; INT_PTR rc; @@ -2208,7 +2208,7 @@ static void test_lnks(void) static void test_exes(void) { - char filename[MAX_PATH]; + char filename[2 * MAX_PATH + 17]; char params[1024]; INT_PTR rc; @@ -2386,7 +2386,7 @@ static void hook_WaitForInputIdle(DWORD (WINAPI *new_func)(HANDLE, DWORD)) static void test_dde(void) { - char filename[MAX_PATH], defApplication[MAX_PATH]; + char filename[MAX_PATH + 14], defApplication[MAX_PATH]; const dde_tests_t* test; char params[1024]; INT_PTR rc; @@ -2553,7 +2553,7 @@ static DWORD CALLBACK ddeThread(LPVOID arg) static void test_dde_default_app(void) { - char filename[MAX_PATH]; + char filename[MAX_PATH + 14]; HSZ hszApplication; dde_thread_info_t info = { filename, GetCurrentThreadId() }; const dde_default_app_tests_t* test; @@ -2655,7 +2655,7 @@ static void init_test(void) { HMODULE hdll; HRESULT (WINAPI *pDllGetVersion)(DLLVERSIONINFO*); - char filename[MAX_PATH]; + char filename[MAX_PATH + 26]; WCHAR lnkfile[MAX_PATH]; char params[1024]; const char* const * testfile; @@ -2812,7 +2812,7 @@ static void cleanup_test(void) static void test_directory(void) { - char path[MAX_PATH], curdir[MAX_PATH]; + char path[MAX_PATH + 10], curdir[MAX_PATH]; char params[1024], dirpath[1024]; INT_PTR rc;

1 0