February 2020 - Wine-commits

Kevin Puetz : wtypes.idl: Support OLESTR macro with non-native wchar_t.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: 3bc14e79ebdf2d810bddefadea3d50a1e43fcf89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bc14e79ebdf2d810bddefad… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Thu Feb 13 11:36:05 2020 +0100 wtypes.idl: Support OLESTR macro with non-native wchar_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wtypes.idl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/wtypes.idl b/include/wtypes.idl index 032d64b984..a6682212b5 100644 --- a/include/wtypes.idl +++ b/include/wtypes.idl @@ -287,7 +287,11 @@ typedef WCHAR OLECHAR; typedef [string] OLECHAR *LPOLESTR; typedef [string] const OLECHAR *LPCOLESTR; cpp_quote("#ifndef __WINESRC__") -cpp_quote("#define OLESTR(str) L##str") +cpp_quote("# ifdef WINE_UNICODE_NATIVE") +cpp_quote("# define OLESTR(str) L##str") +cpp_quote("# else") +cpp_quote("# define OLESTR(str) u##str") +cpp_quote("# endif") cpp_quote("#endif") typedef LONG SCODE;

1 0

Jacek Caban : corecrt_wstdio.h: Add new file and use it instead of duplicating declarations in stdio.h and wchar.h.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: ba07e25ccf71fcc073652d756b6aec6d8edb50a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba07e25ccf71fcc073652d75… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 13 15:24:09 2020 +0100 corecrt_wstdio.h: Add new file and use it instead of duplicating declarations in stdio.h and wchar.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/msvcrt/corecrt_wstdio.h | 123 ++++++++++++++++++++++++++++++++++++++++ include/msvcrt/stdio.h | 103 +-------------------------------- include/msvcrt/wchar.h | 99 +------------------------------- 4 files changed, 126 insertions(+), 200 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ba07e25ccf71fcc07365…

1 0

Jacek Caban : tchar.h: Fix some macros.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: 40c3662fb3d30458e20de7219973e97a70668740 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40c3662fb3d30458e20de721… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 13 13:13:21 2020 +0100 tchar.h: Fix some macros. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/tchar.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/include/tchar.h b/include/tchar.h index 8de69c7466..e14aaf3884 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -104,7 +104,7 @@ extern "C" { #define _tchmod WINE_tchar_routine(chmod, _chmod, _wchmod) #define _tcreat WINE_tchar_routine(creat, _creat, _wcreat) #define _tcscat WINE_tchar_routine(strcat, _mbscat, wcscat) -#define _tcscat_s WINE_tchar_routine(strncat_s, _mbsncat_s, wcsncat_s) +#define _tcscat_s WINE_tchar_routine(strcat_s, _mbscat_s, wcscat_s) #define _tcschr WINE_tchar_routine(strchr, _mbschr, wcschr) #define _tcsclen WINE_tchar_routine(strlen, _mbslen, wcslen) #define _tcscmp WINE_tchar_routine(strcmp, _mbscmp, wcscmp) @@ -123,17 +123,15 @@ extern "C" { #define _tcslwr_s WINE_tchar_routine(_strlwr_s, _mbslwr_s, _wcslwr_s) #define _tcsnbcnt WINE_tchar_routine(_strncnt, _mbsnbcnt, _wcnscnt) #define _tcsncat WINE_tchar_routine(strncat, _mbsnbcat, wcsncat) -#define _tcscat_s WINE_tchar_routine(strcat_s, _mbsnbcat_s, wcscat_s) +#define _tcsncat_s WINE_tchar_routine(strncat_s, _mbsncat_s, wcsncat_s) #define _tcsnccat WINE_tchar_routine(strncat, _mbsncat, wcsncat) #define _tcsncmp WINE_tchar_routine(strncmp, _mbsnbcmp, wcsncmp) -#define _tcsncpy WINE_tchar_routine(strncpy, _mbsncpy, wcsncpy) -#define _tcsncpy_s WINE_tchar_routine(strncpy_s, _mbsncpy_s, wcsncpy_s) #define _tcsnccmp WINE_tchar_routine(strncmp, _mbsncmp, wcsncmp) #define _tcsnccnt WINE_tchar_routine(_strncnt, _mbsnccnt, _wcsncnt) #define _tcsnccpy WINE_tchar_routine(strncpy, _mbsncpy, wcsncpy) #define _tcsncicmp WINE_tchar_routine(_strnicmp, _mbsnicmp, _wcsnicmp) #define _tcsncpy WINE_tchar_routine(strncpy, _mbsnbcpy, wcsncpy) -#define _tcsncpy WINE_tchar_routine(strncpy_s, _mbsnbcpy_s, wcsncpy_s) +#define _tcsncpy_s WINE_tchar_routine(strncpy_s, _mbsnbcpy_s, wcsncpy_s) #define _tcsncset WINE_tchar_routine(_strnset, _mbsnset, _wcsnset) #define _tcsnextc WINE_tchar_routine(_strnextc, _mbsnextc, _wcsnextc) #define _tcsnicmp WINE_tchar_routine(_strnicmp, _mbsnicmp, _wcsnicmp)

1 0

Jacek Caban : makedep: Use msvcrt headers for objects inside importlibs.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: 0d537c854c24f85a506a27e417b94d1410c50368 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d537c854c24f85a506a27e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 12 15:55:31 2020 +0100 makedep: Use msvcrt headers for objects inside importlibs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/crt_main.c | 2 +- dlls/msvcrt/crt_wmain.c | 2 +- dlls/msvcrt/iob.c | 6 +++--- dlls/msvcrt/mathf.c | 14 +++++++++++++- dlls/msvcrt/onexit.c | 1 + dlls/ucrtbase/printf.c | 1 + tools/makedep.c | 1 + 7 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/crt_main.c b/dlls/msvcrt/crt_main.c index 7502f30075..d9e3e66964 100644 --- a/dlls/msvcrt/crt_main.c +++ b/dlls/msvcrt/crt_main.c @@ -24,7 +24,7 @@ #ifdef __MINGW32__ -#include "msvcrt.h" +#include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/msvcrt/crt_wmain.c b/dlls/msvcrt/crt_wmain.c index 0588d5bdce..60a67bbe30 100644 --- a/dlls/msvcrt/crt_wmain.c +++ b/dlls/msvcrt/crt_wmain.c @@ -24,7 +24,7 @@ #ifdef __MINGW32__ -#include "msvcrt.h" +#include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/msvcrt/iob.c b/dlls/msvcrt/iob.c index 5d289f6ba0..a499f19309 100644 --- a/dlls/msvcrt/iob.c +++ b/dlls/msvcrt/iob.c @@ -23,15 +23,15 @@ #pragma makedep implib #endif -#include "msvcrt.h" +#include <stdio.h> #undef __iob_func -extern MSVCRT_FILE * CDECL __iob_func(void); +extern FILE * __cdecl __iob_func(void); /********************************************************************* * __acrt_iob_func(UCRTBASE.@) */ -MSVCRT_FILE * CDECL __acrt_iob_func(unsigned idx) +FILE * __cdecl __acrt_iob_func(unsigned idx) { return __iob_func() + idx; } diff --git a/dlls/msvcrt/mathf.c b/dlls/msvcrt/mathf.c index c2db0c54c3..232740df15 100644 --- a/dlls/msvcrt/mathf.c +++ b/dlls/msvcrt/mathf.c @@ -23,7 +23,19 @@ #pragma makedep implib #endif -#include <math.h> +#include <corecrt.h> + +double __cdecl sin(double); +double __cdecl cos(double); +double __cdecl tan(double); +double __cdecl atan2(double, double); +double __cdecl exp(double); +double __cdecl log(double); +double __cdecl pow(double, double); +double __cdecl sqrt(double); +double __cdecl floor(double); +double __cdecl ceil(double); +float __cdecl powf(float, float); #if defined(__i386__) || (_MSVCR_VER > 0 && _MSVCR_VER < 80) float sinf(float x) { return sin(x); } diff --git a/dlls/msvcrt/onexit.c b/dlls/msvcrt/onexit.c index d1877a1c38..62d884f3ac 100644 --- a/dlls/msvcrt/onexit.c +++ b/dlls/msvcrt/onexit.c @@ -23,6 +23,7 @@ #pragma makedep implib #endif +#define _CRTIMP #include "msvcrt.h" #include "mtdll.h" diff --git a/dlls/ucrtbase/printf.c b/dlls/ucrtbase/printf.c index 8f58e6c3e5..099026950f 100644 --- a/dlls/ucrtbase/printf.c +++ b/dlls/ucrtbase/printf.c @@ -21,6 +21,7 @@ #pragma makedep implib #endif +#define _CRTIMP #include <stdarg.h> #include "msvcrt.h" diff --git a/tools/makedep.c b/tools/makedep.c index 1d9a1b5a59..1e33b1c673 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1628,6 +1628,7 @@ static void parse_file( struct makefile *make, struct incl_file *source, int src source->files_size = file->deps_count; source->files = xmalloc( source->files_size * sizeof(*source->files) ); if (file->flags & FLAG_C_UNIX) source->use_msvcrt = 0; + else if (file->flags & FLAG_C_IMPLIB) source->use_msvcrt = 1; if (source->sourcename) {

1 0

Dmitry Timoshkov : adsldp: Add LDAPNamespace stubs.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: 5b1ea57821087386bf1b7d2019d31470deef64ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b1ea57821087386bf1b7d20… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 13 10:46:32 2020 +0800 adsldp: Add LDAPNamespace stubs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/Makefile.in | 2 + dlls/adsldp/adsldp.c | 294 ++++++++++++++++++++++++++++++++++++++++++++---- dlls/adsldp/adsldp.idl | 8 ++ dlls/adsldp/adsldp.rgs | 16 +++ dlls/adsldp/rsrc.rc | 20 ++++ 5 files changed, 315 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5b1ea57821087386bf1b…

1 0

Dmitry Timoshkov : adsldp: Add IADsOpenDSObject stubs.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: 9b3418d4b98cd6198972106fd13cc1e2d7435541 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b3418d4b98cd6198972106f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 13 10:46:35 2020 +0800 adsldp: Add IADsOpenDSObject stubs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 7686da9a3c..7281375e91 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -258,6 +258,7 @@ static HRESULT ADSystemInfo_create(REFIID riid, void **obj) typedef struct { IADs IADs_iface; + IADsOpenDSObject IADsOpenDSObject_iface; LONG ref; } LDAP_namespace; @@ -268,6 +269,8 @@ static inline LDAP_namespace *impl_from_IADs(IADs *iface) static HRESULT WINAPI ldapns_QueryInterface(IADs *iface, REFIID riid, void **obj) { + LDAP_namespace *ldap = impl_from_IADs(iface); + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); if (!riid || !obj) return E_INVALIDARG; @@ -281,6 +284,13 @@ static HRESULT WINAPI ldapns_QueryInterface(IADs *iface, REFIID riid, void **obj return S_OK; } + if (IsEqualGUID(riid, &IID_IADsOpenDSObject)) + { + IADs_AddRef(iface); + *obj = &ldap->IADsOpenDSObject_iface; + return S_OK; + } + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -434,6 +444,97 @@ static const IADsVtbl IADs_vtbl = ldapns_GetInfoEx }; +static inline LDAP_namespace *impl_from_IADsOpenDSObject(IADsOpenDSObject *iface) +{ + return CONTAINING_RECORD(iface, LDAP_namespace, IADsOpenDSObject_iface); +} + +static HRESULT WINAPI openobj_QueryInterface(IADsOpenDSObject *iface, REFIID riid, void **obj) +{ + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (!riid || !obj) return E_INVALIDARG; + + if (IsEqualGUID(riid, &IID_IADsOpenDSObject) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IADsOpenDSObject_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI openobj_AddRef(IADsOpenDSObject *iface) +{ + LDAP_namespace *ldap = impl_from_IADsOpenDSObject(iface); + return InterlockedIncrement(&ldap->ref); +} + +static ULONG WINAPI openobj_Release(IADsOpenDSObject *iface) +{ + LDAP_namespace *ldap = impl_from_IADsOpenDSObject(iface); + LONG ref = InterlockedDecrement(&ldap->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + HeapFree(GetProcessHeap(), 0, ldap); + } + + return ref; +} + +static HRESULT WINAPI openobj_GetTypeInfoCount(IADsOpenDSObject *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI openobj_GetTypeInfo(IADsOpenDSObject *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%#x,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI openobj_GetIDsOfNames(IADsOpenDSObject *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + return E_NOTIMPL; +} + +static HRESULT WINAPI openobj_Invoke(IADsOpenDSObject *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + params, result, excepinfo, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, BSTR user, BSTR password, + LONG reserved, IDispatch **obj) +{ + FIXME("%p,%s,%s,%s,%d,%p: stub\n", iface, debugstr_w(path), debugstr_w(user), debugstr_w(password), + reserved, obj); + return E_NOTIMPL; +} + +static const IADsOpenDSObjectVtbl IADsOpenDSObject_vtbl = +{ + openobj_QueryInterface, + openobj_AddRef, + openobj_Release, + openobj_GetTypeInfoCount, + openobj_GetTypeInfo, + openobj_GetIDsOfNames, + openobj_Invoke, + openobj_OpenDSObject +}; + static HRESULT LDAPNamespace_create(REFIID riid, void **obj) { LDAP_namespace *ldap; @@ -443,6 +544,7 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) if (!ldap) return E_OUTOFMEMORY; ldap->IADs_iface.lpVtbl = &IADs_vtbl; + ldap->IADsOpenDSObject_iface.lpVtbl = &IADsOpenDSObject_vtbl; ldap->ref = 1; hr = IADs_QueryInterface(&ldap->IADs_iface, riid, obj);

1 0

Dmitry Timoshkov : adsldp/tests: Add some tests for LDAPNamespace.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: wine Branch: master Commit: 0bb5b0f21e16f2b9e8f033911d9075bb56de210c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bb5b0f21e16f2b9e8f03391… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 13 10:46:38 2020 +0800 adsldp/tests: Add some tests for LDAPNamespace. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/tests/Makefile.in | 1 + dlls/adsldp/tests/ldap.c | 81 +++++++++++++++++++++++++++++++++++++++++++ dlls/adsldp/tests/sysinfo.c | 2 ++ 3 files changed, 84 insertions(+) diff --git a/dlls/adsldp/tests/Makefile.in b/dlls/adsldp/tests/Makefile.in index 777d2aa9de..52141139d5 100644 --- a/dlls/adsldp/tests/Makefile.in +++ b/dlls/adsldp/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = adsldp.dll IMPORTS = ole32 oleaut32 secur32 advapi32 uuid C_SRCS = \ + ldap.c \ sysinfo.c diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c new file mode 100644 index 0000000000..e2ce9ee1a2 --- /dev/null +++ b/dlls/adsldp/tests/ldap.c @@ -0,0 +1,81 @@ +/* + * LDAPNamespace Tests + * + * Copyright 2019 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "iads.h" + +#include "wine/test.h" + +#include "initguid.h" +DEFINE_GUID(CLSID_LDAPNamespace,0x228d9a82,0xc302,0x11cf,0x9a,0xa4,0x00,0xaa,0x00,0x4a,0x56,0x91); + +static void test_LDAP(void) +{ + HRESULT hr; + IUnknown *unk; + IADs *ads; + IADsOpenDSObject *ads_open; + IDispatch *disp; + BSTR path; + + hr = CoCreateInstance(&CLSID_LDAPNamespace, 0, CLSCTX_INPROC_SERVER, &IID_IADs, (void **)&ads); + ok(hr == S_OK, "got %#x\n", hr); + IADs_Release(ads); + + hr = CoCreateInstance(&CLSID_LDAPNamespace, 0, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IUnknown_QueryInterface(unk, &IID_IDispatch, (void **)&disp); + ok(hr == S_OK, "got %#x\n", hr); + IDispatch_Release(disp); + + hr = IUnknown_QueryInterface(unk, &IID_IADsOpenDSObject, (void **)&ads_open); + ok(hr == S_OK, "got %#x\n", hr); + IADsOpenDSObject_Release(ads_open); + + path = SysAllocString(L"LDAP:"); + hr = IADsOpenDSObject_OpenDSObject(ads_open, path, NULL, NULL, ADS_SECURE_AUTHENTICATION, &disp); + SysFreeString(path); +todo_wine + ok(hr == S_OK, "got %#x\n", hr); +if (hr == S_OK) + IDispatch_Release(disp); + + IUnknown_Release(unk); +} + +START_TEST(ldap) +{ + HRESULT hr; + + hr = CoInitialize(NULL); + ok(hr == S_OK, "got %#x\n", hr); + + test_LDAP(); + + CoUninitialize(); +} diff --git a/dlls/adsldp/tests/sysinfo.c b/dlls/adsldp/tests/sysinfo.c index f2fc92a1b2..c7495dcb88 100644 --- a/dlls/adsldp/tests/sysinfo.c +++ b/dlls/adsldp/tests/sysinfo.c @@ -210,4 +210,6 @@ START_TEST(sysinfo) test_ComputerName(); test_UserName(); test_sysinfo(); + + CoUninitialize(); }

1 0

Francois Gouget : testbot/LogUtils: Return the errors in the Parse*() $LogInfo structure.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: tools Branch: master Commit: 79d2f8d8e174a1d9c26e41ac45b15e0e407df2c2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=79d2f8d8e174a1d9c26e41a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 13 12:12:46 2020 +0100 testbot/LogUtils: Return the errors in the Parse*() $LogInfo structure. This avoids parsing the logs twice: once for the consistency checks and a second time to extract the errors. This also simplifies CreateLogErrorsCache() and allows removing _GetLogErrors(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 284 +++++++++++++++--------------------- 1 file changed, 118 insertions(+), 166 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index e56388a..9f0f313 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -146,6 +146,40 @@ sub GetLogLineCategory($) } +sub _AddLogGroup($$;$) +{ + my ($LogInfo, $GroupName, $LineNo) = @_; + + # In theory the error group names are all unique. But, just in case, make + # sure we don't overwrite $LogInfo->{ErrGroups}->{$GroupName}. + if (!$LogInfo->{ErrGroups}->{$GroupName}) + { + push @{$LogInfo->{ErrGroupNames}}, $GroupName; + $LogInfo->{ErrGroups}->{$GroupName} = { + LineNo => $LineNo || 0, + LineNos => [], + Errors => [] + }; + } + return $LogInfo->{ErrGroups}->{$GroupName}; +} + +sub _AddLogError($$$;$$) +{ + my ($LogInfo, $ErrGroup, $Line, $LineNo, $IsNew) = @_; + + push @{$ErrGroup->{Errors}}, $Line; + push @{$ErrGroup->{LineNos}}, $LineNo || 0; + $LogInfo->{ErrCount}++; + if ($IsNew) + { + my $ErrIndex = @{$ErrGroup->{Errors}} - 1; + $ErrGroup->{IsNew}->[$ErrIndex] = 1; + $ErrGroup->{NewCount}++; + $LogInfo->{NewCount}++; + } +} + =pod =over 12 @@ -167,6 +201,29 @@ have been updated. =item BadLog Contains an error message if the task log could not be read. +=item ErrCount +The number of errors if any. + +=item ErrGroupNames +An array containing the names of all the error groups. + += ErrGroups +A hashtable indexed by the error group name. Each entry contains: + +=over + +=item LineNo +The line number of the start of this error group. Note that this is normally +different from the line of the first error in that group. + +=item Errors +An array containing the error messages. + +=item LineNos +An array containing the line number of the error in the log file. + +=back + =back =back =cut @@ -179,6 +236,9 @@ sub ParseTaskLog($) my $LogInfo = { LogName => $LogName, LogPath => $LogPath, + + ErrGroupNames => [], + ErrGroups => {}, }; my $LogFile; @@ -188,10 +248,20 @@ sub ParseTaskLog($) return $LogInfo; } + my $CurGroup; + my $LineNo = 0; $LogInfo->{Type} = "build"; foreach my $Line (<$LogFile>) { - chomp $Line; + $LineNo++; + $Line =~ s/\s*$//; # chomp \r, \n and more + + if (GetLogLineCategory($Line) eq "error") + { + $CurGroup = _AddLogGroup($LogInfo, "", $LineNo) if (!$CurGroup); + _AddLogError($LogInfo, $CurGroup, $Line, $LineNo); + } + if ($Line eq "Task: tests") { $LogInfo->{Type} = "tests"; @@ -410,11 +480,8 @@ The number of test units that timed out. =item Failures The number of failed tests. -=item Extra -An array containing the extra errors detected during the inconsistency check. - -=item BadLog -Contains an error message if the report could not be read. +=item ErrCount, ErrGroupNames, ErrGroups, BadLog +See ParseTaskLog() for details. =back =back @@ -434,6 +501,10 @@ sub ParseWineTestReport($$$) TestUnitCount => 0, TimeoutCount => 0, Failures => undef, + + ErrGroupNames => [], + ErrGroups => {}, + Extra => [], }; @@ -444,10 +515,32 @@ sub ParseWineTestReport($$$) return $LogInfo; } + my $LineNo = 0; + my $CurGroupName = ""; + my ($CurGroup, $CurGroupLineNo); my $Cur = _NewCurrentUnit("", ""); foreach my $Line (<$LogFile>) { + $LineNo++; $Cur->{UnitSize} += length($Line); + $Line =~ s/\s*$//; # chomp \r, \n and more + + if (GetReportLineCategory($Line) eq "error") + { + # Make the timeout messages more user-friendly + if ($Line =~ m/^[^:]+:([^:]*):[0-9a-f]+ done $258$/) + { + my $Unit = $1; + $Line = $Unit ne "" ? "$Unit: Timeout" : "Timeout"; + } + + if (!$CurGroup) + { + $CurGroup = _AddLogGroup($LogInfo, $CurGroupName, $CurGroupLineNo || $LineNo); + } + _AddLogError($LogInfo, $CurGroup, $Line, $LineNo); + } + if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+) (?:-|[.0-9a-f]+)\r?$%) { my ($Dll, $Unit, $Type) = ($1, $2, $3); @@ -459,6 +552,11 @@ sub ParseWineTestReport($$$) # Recognize skipped messages in case we need to skip tests in the VMs $Cur->{Rc} = 0 if ($Type eq "skipped"); + + # The next error will be in a new error group + $CurGroupName = $Dll; + $CurGroupLineNo = $LineNo; + $CurGroup = undef; } elsif ($Line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)\r?$/) { @@ -602,6 +700,17 @@ sub ParseWineTestReport($$$) _CloseTestUnit($LogInfo, $Cur, 1); close($LogFile); + # Move the extra errors into their own error group + my $ExtraCount = @{$LogInfo->{Extra}}; + if ($ExtraCount) + { + my $CurGroup = _AddLogGroup($LogInfo, "Report validation errors"); + $CurGroup->{Errors} = $LogInfo->{Extra}; + my @LineNos = (0) x $ExtraCount; + $CurGroup->{LineNos} = \@LineNos; + $LogInfo->{ErrCount} += $ExtraCount; + } + return $LogInfo; } @@ -696,149 +805,6 @@ sub GetLogLabel($) return defined $Label ? sprintf($Label, $Extra) : $LogFileName; } -sub _AddLogGroup($$;$) -{ - my ($LogInfo, $GroupName, $LineNo) = @_; - - # In theory the error group names are all unique. But, just in case, make - # sure we don't overwrite $LogInfo->{ErrGroups}->{$GroupName}. - if (!$LogInfo->{ErrGroups}->{$GroupName}) - { - push @{$LogInfo->{ErrGroupNames}}, $GroupName; - $LogInfo->{ErrGroups}->{$GroupName} = { - LineNo => $LineNo || 0, - LineNos => [], - Errors => [] - }; - } - return $LogInfo->{ErrGroups}->{$GroupName}; -} - -sub _AddLogError($$$;$$) -{ - my ($LogInfo, $ErrGroup, $Line, $LineNo, $IsNew) = @_; - - push @{$ErrGroup->{Errors}}, $Line; - push @{$ErrGroup->{LineNos}}, $LineNo || 0; - $LogInfo->{ErrCount}++; - if ($IsNew) - { - my $ErrIndex = @{$ErrGroup->{Errors}} - 1; - $ErrGroup->{IsNew}->[$ErrIndex] = 1; - $ErrGroup->{NewCount}++; - $LogInfo->{NewCount}++; - } -} - -=pod -=over 12 - -=item C<GetLogErrors()> - -Extracts the errors from the specified log file, split by module (for Wine -reports that's per dll / program being tested). - -Returns a hashtable containing: -=over - -=item BadLog -Contains an error message if the log could not be read. - -=item ErrCount -The number of errors. This is undefined if no log file was found. - -=item ErrGroupNames -An array containing the names of all the error groups. - -=item ErrGroups -A hashtable indexed by the error group name. Each entry contains: - -=over - -=item LineNo -The line number of the start of this error group. Note that this is normally -different from the line of the first error in that group. - -=item Errors -An array containing the error messages. - -=item LineNos -An array containing the line number of the error in the log file. - -=back - -=back -=back -=cut - -sub GetLogErrors($) -{ - my ($LogPath) = @_; - - my ($IsReport, $GetCategory); - if ($LogPath =~ /\.report$/) - { - $IsReport = 1; - $GetCategory = \&GetReportLineCategory; - } - else - { - $GetCategory = \&GetLogLineCategory; - } - - my $LogName = basename($LogPath); - my $LogInfo = { - LogName => $LogName, - LogPath => $LogPath, - - ErrCount => undef, # until we open a log - ErrGroupNames => [], - ErrGroups => {}, - }; - if (open(my $LogFile, "<", $LogPath)) - { - $LogInfo->{ErrCount} ||= 0; - my $CurrentModule = ""; - my ($CurrentGroup, $GroupLineNo); - my $LineNo = 0; - foreach my $Line (<$LogFile>) - { - $LineNo++; - $Line =~ s/\s*$//; - if ($IsReport and $Line =~ /^([_.a-z0-9-]+):[_a-z0-9]* start /) - { - $CurrentModule = $1; - $GroupLineNo = $LineNo; - $CurrentGroup = undef; - next; - } - - next if ($GetCategory->($Line) !~ /error/); - - if ($Line =~ m/^[^:]+:([^:]*):[0-9a-f]+ done $258$/) - { - my $Unit = $1; - $Line = $Unit ne "" ? "$Unit: Timeout" : "Timeout"; - } - if (!$CurrentGroup) - { - $CurrentGroup = _AddLogGroup($LogInfo, $CurrentModule, $GroupLineNo || $LineNo); - } - _AddLogError($LogInfo, $CurrentGroup, $Line, $LineNo); - } - close($LogFile); - } - elsif (-f $LogPath) - { - $LogInfo->{BadLog} = "Could not open '$LogName' for reading: $!"; - my $Group = _AddLogGroup($LogInfo, "TestBot errors"); - _AddLogError($LogInfo, $Group, $LogInfo->{BadLog}); - } - - return $LogInfo; -} - - # # Log errors caching [Part 1] # @@ -1079,9 +1045,8 @@ sub _GetLineKey($) # The exact amount of data printed does not change the error $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$[0-9]+ bytes$$/$1/; - # Note: Only the 'done (258)' lines are reported as errors and they are - # modified by GetLogErrors() so that they no longer contain the pid. - # So there is no need to remove the pid from the done lines. + # Note: The 'done (258)' lines are modified by ParseWineTestReport() and + # no longer contain the pid. So they need no further change here. return $Line; } @@ -1194,20 +1159,7 @@ sub TagNewErrors($$) sub CreateLogErrorsCache($;$) { - my ($ParsedInfo, $Task) = @_; - - my $LogInfo = GetLogErrors($ParsedInfo->{LogPath}); - - # Store ParseWineTestReport()'s extra errors into their own group - my $ExtraCount = $ParsedInfo->{Extra} ? @{$ParsedInfo->{Extra}} : 0; - if ($ExtraCount) - { - my $Group = _AddLogGroup($LogInfo, "Report validation errors"); - $Group->{Errors} = $ParsedInfo->{Extra}; - my @LineNos = (0) x $ExtraCount; - $Group->{LineNos} = \@LineNos; - $LogInfo->{ErrCount} += $ExtraCount; - } + my ($LogInfo, $Task) = @_; return $LogInfo->{BadLog} if (defined $LogInfo->{BadLog});

1 0

Francois Gouget : testbot/WineSendLog: Only new errors are reported to the mailing list.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: tools Branch: master Commit: 1fc24dd5ef2822454c4aea2f2f1818662ba987fe URL: https://source.winehq.org/git/tools.git/?a=commit;h=1fc24dd5ef2822454c4aea2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 13 21:35:35 2020 +0100 testbot/WineSendLog: Only new errors are reported to the mailing list. Skip over test results that contain no new error so WineSendLog does not send empty emails to the mailing list. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 2393099..65c95de 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -340,7 +340,7 @@ EOF { my $LogInfo = $JobErrors->{$Key}->{$LogName}; # Skip if there are no errors - next if (!$LogInfo->{ErrCount}); + next if (!$LogInfo->{NewCount}); push @Messages, "\n=== ". GetTitle($StepTask, $LogName) ." ===\n";

1 0

Francois Gouget : testbot: Show the right filename in LoadLogErrors()'s BadLog message.
by Alexandre Julliard 13 Feb '20

13 Feb '20

Module: tools Branch: master Commit: e25d90af5899490e85b578ed9facd8954123bee0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e25d90af5899490e85b578e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 13 12:12:13 2020 +0100 testbot: Show the right filename in LoadLogErrors()'s BadLog message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 2104ffa..e56388a 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -874,7 +874,7 @@ sub LoadLogErrors($) my $ErrorsFile; if (!open($ErrorsFile, "<", $LogPath)) { - $LogInfo->{BadLog} = "Unable to open '$LogName' for reading: $!"; + $LogInfo->{BadLog} = "Unable to open '$LogName.errors' for reading: $!"; return $LogInfo; }

1 0