January 2021 - Wine-commits

Nikolay Sivov : dcomp: Add DCompositionCreateDevice() stub.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 8eabf58dee5b6212d14f425f2c32f6e42a7d8538 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8eabf58dee5b6212d14f425f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 14 22:45:05 2021 +0300 dcomp: Add DCompositionCreateDevice() stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50459 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dcomp/dcomp.spec | 2 +- dlls/dcomp/device.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/dcomp/dcomp.spec b/dlls/dcomp/dcomp.spec index 10e9f49a412..428385e3a2a 100644 --- a/dlls/dcomp/dcomp.spec +++ b/dlls/dcomp/dcomp.spec @@ -15,7 +15,7 @@ @ stub DCompositionAttachMouseWheelToHwnd @ stdcall DCompositionCreateDevice2(ptr ptr ptr) @ stub DCompositionCreateDevice3 -@ stub DCompositionCreateDevice +@ stdcall DCompositionCreateDevice(ptr ptr ptr) @ stub DCompositionCreateSurfaceHandle @ stub DeserializeEffectDescription @ stub DllCanUnloadNow diff --git a/dlls/dcomp/device.c b/dlls/dcomp/device.c index efc6bacdb08..2d0600ce50a 100644 --- a/dlls/dcomp/device.c +++ b/dlls/dcomp/device.c @@ -20,10 +20,18 @@ #include "windef.h" #include "winbase.h" #include "objidl.h" +#include "dxgi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dcomp); +HRESULT WINAPI DCompositionCreateDevice(IDXGIDevice *dxgi_device, REFIID iid, void **device) +{ + FIXME("%p, %s, %p.\n", dxgi_device, debugstr_guid(iid), device); + + return E_NOTIMPL; +} + HRESULT WINAPI DCompositionCreateDevice2(IUnknown *rendering_device, REFIID iid, void **device) { FIXME("%p, %s, %p.\n", rendering_device, debugstr_guid(iid), device);

1 0

Alistair Leslie-Hughes : msado15: Only support put CursorLocation on Closed Recordset.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 44501a2781010259921cbb34495ff8109173da08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44501a2781010259921cbb34… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 15 18:22:13 2021 +1100 msado15: Only support put CursorLocation on Closed Recordset. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index e915922fdc4..e830f66e1ba 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1279,6 +1279,8 @@ static HRESULT WINAPI recordset_put_CursorLocation( _Recordset *iface, CursorLoc TRACE( "%p, %u\n", iface, cursor_loc ); + if (recordset->state == adStateOpen) return MAKE_ADO_HRESULT( adErrObjectOpen ); + recordset->cursor_location = cursor_loc; return S_OK;

1 0

Alistair Leslie-Hughes : msado15: Support ADOConnectionConstruction15 on _Connection interface.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 3289a7a2d40e77036278b59462ab200a7020a4ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=3289a7a2d40e77036278b594… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 15 18:22:14 2021 +1100 msado15: Support ADOConnectionConstruction15 on _Connection interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msado15/tests/msado15.c | 2 +- 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index fd15d5a443f..c6a52e262c2 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -50,6 +50,7 @@ struct connection _Connection Connection_iface; ISupportErrorInfo ISupportErrorInfo_iface; IConnectionPointContainer IConnectionPointContainer_iface; + ADOConnectionConstruction15 ADOConnectionConstruction15_iface; LONG refs; ObjectStateEnum state; LONG timeout; @@ -76,6 +77,11 @@ static inline struct connection *impl_from_IConnectionPointContainer( IConnectio return CONTAINING_RECORD( iface, struct connection, IConnectionPointContainer_iface ); } +static inline struct connection *impl_from_ADOConnectionConstruction15( ADOConnectionConstruction15 *iface ) +{ + return CONTAINING_RECORD( iface, struct connection, ADOConnectionConstruction15_iface ); +} + static inline struct connection_point *impl_from_IConnectionPoint( IConnectionPoint *iface ) { return CONTAINING_RECORD( iface, struct connection_point, IConnectionPoint_iface ); @@ -129,6 +135,10 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid { *obj = &connection->IConnectionPointContainer_iface; } + else if (IsEqualGUID( riid, &IID_ADOConnectionConstruction15 )) + { + *obj = &connection->ADOConnectionConstruction15_iface; + } else if (IsEqualGUID( riid, &IID_IRunnableObject )) { TRACE("IID_IRunnableObject not supported returning NULL\n"); @@ -715,6 +725,56 @@ static const IConnectionPointVtbl connpoint_vtbl = connpoint_EnumConnections }; +static HRESULT WINAPI adoconstruct_QueryInterface(ADOConnectionConstruction15 *iface, REFIID riid, void **obj) +{ + struct connection *connection = impl_from_ADOConnectionConstruction15( iface ); + return _Connection_QueryInterface( &connection->Connection_iface, riid, obj ); +} + +static ULONG WINAPI adoconstruct_AddRef(ADOConnectionConstruction15 *iface) +{ + struct connection *connection = impl_from_ADOConnectionConstruction15( iface ); + return _Connection_AddRef( &connection->Connection_iface ); +} + +static ULONG WINAPI adoconstruct_Release(ADOConnectionConstruction15 *iface) +{ + struct connection *connection = impl_from_ADOConnectionConstruction15( iface ); + return _Connection_Release( &connection->Connection_iface ); +} + +static HRESULT WINAPI adoconstruct_get_DSO(ADOConnectionConstruction15 *iface, IUnknown **dso) +{ + struct connection *connection = impl_from_ADOConnectionConstruction15( iface ); + FIXME("%p, %p\n", connection, dso); + return E_NOTIMPL; +} + +static HRESULT WINAPI adoconstruct_get_Session(ADOConnectionConstruction15 *iface, IUnknown **session) +{ + struct connection *connection = impl_from_ADOConnectionConstruction15( iface ); + FIXME("%p, %p\n", connection, session); + return E_NOTIMPL; +} + +static HRESULT WINAPI adoconstruct_WrapDSOandSession(ADOConnectionConstruction15 *iface, IUnknown *dso, + IUnknown *session) +{ + struct connection *connection = impl_from_ADOConnectionConstruction15( iface ); + FIXME("%p, %p, %p\n", connection, dso, session); + return E_NOTIMPL; +} + +struct ADOConnectionConstruction15Vtbl ado_construct_vtbl = +{ + adoconstruct_QueryInterface, + adoconstruct_AddRef, + adoconstruct_Release, + adoconstruct_get_DSO, + adoconstruct_get_Session, + adoconstruct_WrapDSOandSession +}; + HRESULT Connection_create( void **obj ) { struct connection *connection; @@ -723,6 +783,7 @@ HRESULT Connection_create( void **obj ) connection->Connection_iface.lpVtbl = &connection_vtbl; connection->ISupportErrorInfo_iface.lpVtbl = &support_error_vtbl; connection->IConnectionPointContainer_iface.lpVtbl = &connpointcontainer_vtbl; + connection->ADOConnectionConstruction15_iface.lpVtbl = &ado_construct_vtbl; connection->refs = 1; connection->state = adStateClosed; connection->timeout = 30; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 8b08e8af193..50418690613 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -1046,7 +1046,7 @@ static void test_Connection(void) IConnectionPointContainer_Release(pointcontainer); hr = _Connection_QueryInterface(connection, &IID_ADOConnectionConstruction15, (void**)&construct); - todo_wine ok(hr == S_OK, "Failed to get ADOConnectionConstruction15 interface %08x\n", hr); + ok(hr == S_OK, "Failed to get ADOConnectionConstruction15 interface %08x\n", hr); if (hr == S_OK) ADOConnectionConstruction15_Release(construct);

1 0

Alistair Leslie-Hughes : msado15: Implement ADOConnectionConstruction15 get_Session.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 8af32e41c2b3301fecf27ca673e2853dae9f494e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8af32e41c2b3301fecf27ca6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 15 18:22:15 2021 +1100 msado15: Implement ADOConnectionConstruction15 get_Session. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index c6a52e262c2..63014d7e37e 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -753,8 +753,12 @@ static HRESULT WINAPI adoconstruct_get_DSO(ADOConnectionConstruction15 *iface, I static HRESULT WINAPI adoconstruct_get_Session(ADOConnectionConstruction15 *iface, IUnknown **session) { struct connection *connection = impl_from_ADOConnectionConstruction15( iface ); - FIXME("%p, %p\n", connection, session); - return E_NOTIMPL; + TRACE("%p, %p\n", connection, session); + + *session = connection->session; + if (*session) + IUnknown_AddRef(*session); + return S_OK; } static HRESULT WINAPI adoconstruct_WrapDSOandSession(ADOConnectionConstruction15 *iface, IUnknown *dso,

1 0

Paul Gofman : dbghelp: Fix unwind opcodes on x64.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 6bcde00566f506ffb1f7cfd9e584c793d6f4a02f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bcde00566f506ffb1f7cfd9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jan 15 16:06:40 2021 +0300 dbghelp: Fix unwind opcodes on x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/cpu_x86_64.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index c2789d0d71b..c04d8db61cf 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -41,7 +41,8 @@ typedef enum _UNWIND_OP_CODES UWOP_SET_FPREG, UWOP_SAVE_NONVOL, UWOP_SAVE_NONVOL_FAR, - UWOP_SAVE_XMM128, + UWOP_EPILOG, + UWOP_SAVE_XMM128 = 8, UWOP_SAVE_XMM128_FAR, UWOP_PUSH_MACHFRAME } UNWIND_CODE_OPS;

1 0

Paul Gofman : dbghelp: Support UWOP_PUSH_MACHFRAME on x64.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 400520192284c34e5b34b52b657cd3dda084403f URL: https://source.winehq.org/git/wine.git/?a=commit;h=400520192284c34e5b34b52b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jan 15 16:06:41 2021 +0300 dbghelp: Support UWOP_PUSH_MACHFRAME on x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/cpu_x86_64.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index c04d8db61cf..8e8ac85dd2f 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -474,6 +474,7 @@ static BOOL interpret_function_table_entry(struct cpu_stack_walk* csw, DWORD64 newframe, prolog_offset, off, value; M128A floatvalue; union handler_data handler_data; + BOOL mach_frame = FALSE; /* FIXME: we have some assumptions here */ assert(context); @@ -556,7 +557,23 @@ static BOOL interpret_function_table_entry(struct cpu_stack_walk* csw, set_float_reg(context, info->UnwindCode[i].u.OpInfo, floatvalue); break; case UWOP_PUSH_MACHFRAME: - FIXME("PUSH_MACHFRAME %u\n", info->UnwindCode[i].u.OpInfo); + if (info->Flags & UNW_FLAG_CHAININFO) + { + FIXME("PUSH_MACHFRAME with chained unwind info.\n"); + break; + } + if (i + get_opcode_size(info->UnwindCode[i]) < info->CountOfCodes) + { + FIXME("PUSH_MACHFRAME is not the last opcode.\n"); + break; + } + + if (info->UnwindCode[i].u.OpInfo) + context->Rsp += 0x8; + + if (!sw_read_mem(csw, context->Rsp, &context->Rip, sizeof(DWORD64))) return FALSE; + if (!sw_read_mem(csw, context->Rsp + 24, &context->Rsp, sizeof(DWORD64))) return FALSE; + mach_frame = TRUE; break; default: FIXME("unknown code %u\n", info->UnwindCode[i].u.UnwindOp); @@ -569,7 +586,7 @@ static BOOL interpret_function_table_entry(struct cpu_stack_walk* csw, &handler_data, sizeof(handler_data))) return FALSE; function = &handler_data.chain; /* restart with the chained info */ } - return default_unwind(csw, context); + return mach_frame ? TRUE : default_unwind(csw, context); } /* fetch_next_frame()

1 0

Martin Storsjo : include: Don't use __attribute__((pcs("aapcs-vfp"))) when building in PE mode.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 52398912f954a28007468c41be7d108e0f9f11bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=52398912f954a28007468c41… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Jan 11 23:00:21 2021 +0200 include: Don't use __attribute__((pcs("aapcs-vfp"))) when building in PE mode. Clang doesn't support this attribute for windows targets right now; the attribute is only needed for selecting a potentially non-default calling convention on e.g. linux. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt.h | 4 ++-- include/windef.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index a66f43877ac..4adbe0920f6 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -79,7 +79,7 @@ # else # define __stdcall __attribute__((ms_abi)) # endif -# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) +# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32) # define __stdcall __attribute__((pcs("aapcs-vfp"))) # elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi) # define __stdcall __attribute__((ms_abi)) @@ -120,7 +120,7 @@ #endif #ifndef WINAPIV -# if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) +# if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32) # define WINAPIV __attribute__((pcs("aapcs"))) # else # define WINAPIV __cdecl diff --git a/include/windef.h b/include/windef.h index 5351afe66db..ac2ec619fbd 100644 --- a/include/windef.h +++ b/include/windef.h @@ -72,7 +72,7 @@ extern "C" { # else # define __stdcall __attribute__((ms_abi)) # endif -# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) +# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32) # define __stdcall __attribute__((pcs("aapcs-vfp"))) # elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi) # define __stdcall __attribute__((ms_abi)) @@ -120,7 +120,7 @@ extern "C" { # endif #endif -#if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) +#if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32) # define WINAPIV __attribute__((pcs("aapcs"))) #else # define WINAPIV __cdecl

1 0

Alex Henrie : include: Add new LCMAP constants.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: bbb8f1a338aeba0f419350ffe7a514968b839c72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbb8f1a338aeba0f419350ff… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jan 12 02:56:45 2021 -0700 include: Add new LCMAP constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnls.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/winnls.h b/include/winnls.h index e90b6f5a22f..07a31cfde88 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -394,17 +394,18 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e',' /* String mapping flags */ #define LCMAP_LOWERCASE 0x00000100 /* Make lower-case */ #define LCMAP_UPPERCASE 0x00000200 /* Make upper-case */ +#define LCMAP_TITLECASE 0x00000300 /* Make title-case */ #define LCMAP_SORTKEY 0x00000400 /* Create a sort key */ #define LCMAP_BYTEREV 0x00000800 /* Reverse the result */ - +#define LCMAP_HASH 0x00040000 #define LCMAP_HIRAGANA 0x00100000 /* Transform Japanese katakana into hiragana */ #define LCMAP_KATAKANA 0x00200000 /* Transform Japanese hiragana into katakana */ #define LCMAP_HALFWIDTH 0x00400000 /* Use single byte chars in output */ #define LCMAP_FULLWIDTH 0x00800000 /* Use double byte chars in output */ - #define LCMAP_LINGUISTIC_CASING 0x01000000 /* Change case by using language context */ #define LCMAP_SIMPLIFIED_CHINESE 0x02000000 /* Transform Chinese traditional into simplified */ #define LCMAP_TRADITIONAL_CHINESE 0x04000000 /* Transform Chinese simplified into traditional */ +#define LCMAP_SORTHANDLE 0x20000000 /* Date and time formatting flags */ #define DATE_SHORTDATE 0x01 /* Short date format */

1 0

Alexandre Julliard : packaging: Update .deb package names for new OBS scheme.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: tools Branch: master Commit: d0538f3bad27a742ca19b37fae1ecdef16098399 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d0538f3bad27a742ca19b37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 21:19:06 2021 +0100 packaging: Update .deb package names for new OBS scheme. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/obs-sync | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 6ddbc48..29960d3 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -71,14 +71,14 @@ add_deb () test -d $dstdir || mkdir -p $dstdir for arch in $deb_archs do - rsync -aq $obsdir/$arch/${wine_pkg}_$debver\~${2}_$arch.deb $obsdir/$arch/${winehq_pkg}_$debver\~${2}_$arch.deb $dstdir/binary-$arch/ + rsync -aq $obsdir/$arch/${wine_pkg}_$debver\~${2}-1_$arch.deb $obsdir/$arch/${winehq_pkg}_$debver\~${2}-1_$arch.deb $dstdir/binary-$arch/ done - dscverify -u $obsdir/$source_pkg\~$2.dsc - if test -f $obsdir/$source_pkg\~$2.diff.gz + dscverify -u $obsdir/$source_pkg\~$2-1.dsc + if test -f $obsdir/$source_pkg\~$2-1.diff.gz then - rsync -aq $obsdir/$source_pkg\~$2.dsc $obsdir/$source_pkg\~$2.diff.gz $obsdir/$source_pkg\~$2.orig.tar.gz $dstdir/source/ + rsync -aq $obsdir/$source_pkg\~$2-1.dsc $obsdir/$source_pkg\~$2-1.diff.gz $obsdir/$source_pkg\~$2.orig.tar.gz $dstdir/source/ else - rsync -aq $obsdir/$source_pkg\~$2.dsc $obsdir/$source_pkg\~$2.tar.xz $dstdir/source/ + rsync -aq $obsdir/$source_pkg\~$2-1.dsc $obsdir/$source_pkg\~$2-1.debian.tar.xz $obsdir/$source_pkg\~$2.orig.tar.gz $dstdir/source/ fi if test -n "$4"

1 0

Francois Gouget : testbot: Take into account configure for the build timeout.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: tools Branch: master Commit: e9d470d7e63724d8f989603b47830ece7fc1b1d9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e9d470d7e63724d8f989603… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 15 16:09:19 2021 +0100 testbot: Take into account configure for the build timeout. It is likely that configure will need to be rerun after a make_makefiles, even outside of full rebuilds. In particular this is the case when adding a new dll, program or test directory. So take the configure time out of the full-rebuild timeouts and into its own $ReconfigBuildTimeout setting. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Config.pm | 11 +++++++---- testbot/lib/WineTestBot/PatchUtils.pm | 7 +++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 68709e5..2f01e95 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -31,7 +31,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $MaxVMsWhenIdle $WaitForBoot $SleepAfterBoot $SleepAfterRevert $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc - $ExeBuildTimeout $ExeModuleTimeout + $ReconfigBuildTimeout $ExeBuildTimeout $ExeModuleTimeout $WineBuildTimeout $WineModuleTimeout $TimeoutMargin $SuiteTimeout $SingleTimeout $SingleAvgTime $MaxUnitSize $TagPrefix $ProjectName $PatchesMailingList $LDAPServer @@ -48,7 +48,7 @@ require Exporter; $SleepAfterRevert $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout - $ExeBuildTimeout $ExeModuleTimeout + $ReconfigBuildTimeout $ExeBuildTimeout $ExeModuleTimeout $WineBuildTimeout $WineModuleTimeout $TimeoutMargin $SuiteTimeout $SingleTimeout $SingleAvgTime $MaxUnitSize $TagPrefix $ProjectName $PatchesMailingList @@ -109,15 +109,18 @@ $MaxVMErrors = 3; # How many times to run a test that fails before giving up. $MaxTaskTries = 3; +# Build configure timeout (in seconds) +$ReconfigBuildTimeout = 60; + # Exe build timeouts (in seconds) # - For a full build -$ExeBuildTimeout = 7 * 60; +$ExeBuildTimeout = 6 * 60; # - For a single module $ExeModuleTimeout = 30; # Wine build timeouts (in seconds) # - For a full build -$WineBuildTimeout = 25 * 60; +$WineBuildTimeout = 24 * 60; # - For a single module $WineModuleTimeout = 60; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 26c16c4..974ff8e 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -521,19 +521,22 @@ sub GetBuildTimeout($$) # Set $ModuleCount to 0 if a full rebuild is needed my $ModuleCount = (!$Impacts or $Impacts->{RebuildRoot}) ? 0 : scalar(keys %{$Impacts->{BuildModules}}); + my $Reconfig = (!$Impacts or $Impacts->{Autoconf} or $Impacts->{MakeMakefiles}); my ($ExeTimeout, $WineTimeout) = (0, 0); if ($ExeCount) { my $OneBuild = $ModuleCount ? $ModuleCount * $ExeModuleTimeout : $ExeBuildTimeout; - $ExeTimeout = $ExeCount * min($ExeBuildTimeout, $OneBuild); + $ExeTimeout = $ExeCount * min($ExeBuildTimeout, $OneBuild) + + ($Reconfig ? $ExeCount * $ReconfigBuildTimeout : 0); } if ($WineCount) { my $OneBuild = $ModuleCount ? $ModuleCount * $WineModuleTimeout : $WineBuildTimeout; - $WineTimeout = $WineCount * min($WineBuildTimeout, $OneBuild); + $WineTimeout = $WineCount * min($WineBuildTimeout, $OneBuild) + + ($Reconfig ? $WineCount * $ReconfigBuildTimeout : 0); } return $ExeTimeout + $WineTimeout;

1 0