October 2017 - Wine-Commits

Piotr Caban : vbscript/tests: Add more function call tests with array arguments.
by Alexandre Julliard Oct. 11, 2017

Oct. 11, 2017

Module: wine Branch: master Commit: 8f0d12e2619e240088b92a05b274eeea5483edf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f0d12e2619e240088b92a05b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 10 17:08:30 2017 +0200 vbscript/tests: Add more function call tests with array arguments. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/lang.vbs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 7f7c835..a90dfc8 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1250,6 +1250,20 @@ Call testarrarg(1, "VT_I2*") Call testarrarg(false, "VT_BOOL*") Call testarrarg(Empty, "VT_EMPTY*") +Sub modifyarr(arr) + 'Following test crashes on wine + 'Call ok(arr(0) = "not modified", "arr(0) = " & arr(0)) + arr(0) = "modified" +End Sub + +arr(0) = "not modified" +Call modifyarr(arr) +Call ok(arr(0) = "modified", "arr(0) = " & arr(0)) + +arr(0) = "not modified" +modifyarr(arr) +Call todo_wine_ok(arr(0) = "not modified", "arr(0) = " & arr(0)) + ' It's allowed to declare non-builtin RegExp class... class RegExp public property get Global()

1 0

Daniel Lehman : msvcp120: Implement concurrent_vector::_Segment_index_of.
by Alexandre Julliard Oct. 11, 2017

Oct. 11, 2017

Module: wine Branch: master Commit: 4655942816dd32e6330224871d8e166cedc6922a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4655942816dd32e6330224871… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Sep 5 15:01:47 2017 -0700 msvcp120: Implement concurrent_vector::_Segment_index_of. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 4 +-- dlls/msvcp100/msvcp100.spec | 4 +-- dlls/msvcp110/msvcp110.spec | 4 +-- dlls/msvcp120/msvcp120.spec | 4 +-- dlls/msvcp120_app/msvcp120_app.spec | 4 +-- dlls/msvcp90/misc.c | 49 +++++++++++++++++++++++++++++++++++++ 6 files changed, 59 insertions(+), 10 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index c0a0473..eb0c9fb 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -436,8 +436,8 @@ @ stub -arch=win64 ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z @ cdecl -arch=win32 ?_ScheduleTask(a)_CurrentScheduler@details(a)Concurrency@@SAXP6AXPAX(a)Z0@Z(ptr ptr) msvcr120.?_ScheduleTask(a)_CurrentScheduler@details(a)Concurrency@@SAXP6AXPAX(a)Z0@Z @ cdecl -arch=win64 ?_ScheduleTask(a)_CurrentScheduler@details(a)Concurrency@@SAXP6AXPEAX(a)Z0@Z(ptr ptr) msvcr120.?_ScheduleTask(a)_CurrentScheduler@details(a)Concurrency@@SAXP6AXPEAX(a)Z0@Z -@ stub -arch=win32 ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KAII(a)Z -@ stub -arch=win64 ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KA_K_K(a)Z +@ cdecl -arch=win32 ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KAII(a)Z(long) msvcp120.?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KAII(a)Z +@ cdecl -arch=win64 ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KA_K_K(a)Z(long) msvcp120.?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KA_K_K(a)Z @ thiscall -arch=i386 ?_SetSpinCount@?$_SpinWait@$00(a)details@Concurrency@@QAEXI(a)Z(ptr long) msvcr120.?_SetSpinCount@?$_SpinWait@$00(a)details@Concurrency@@QAEXI(a)Z @ cdecl -arch=win64 ?_SetSpinCount@?$_SpinWait@$00(a)details@Concurrency@@QEAAXI(a)Z(ptr long) msvcr120.?_SetSpinCount@?$_SpinWait@$00(a)details@Concurrency@@QEAAXI(a)Z @ thiscall -arch=i386 ?_SetSpinCount@?$_SpinWait@$0A@@details(a)Concurrency@@QAEXI(a)Z(ptr long) msvcr120.?_SetSpinCount@?$_SpinWait@$0A@@details(a)Concurrency@@QAEXI(a)Z diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 3cbb88d..8bffda2 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -1223,8 +1223,8 @@ @ cdecl -arch=win64 ?_Rep@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@_W_K(a)Z(ptr ptr ptr long long) num_put_wchar__Rep @ stub -arch=win32 ?_Rng_abort(a)tr1@std@@YAXPBD(a)Z @ stub -arch=win64 ?_Rng_abort(a)tr1@std@@YAXPEBD(a)Z -@ stub -arch=win32 ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KAII(a)Z -@ stub -arch=win64 ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KA_K_K(a)Z +@ cdecl -arch=win32 ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KAII(a)Z(long) _vector_base_v4__Segment_index_of +@ cdecl -arch=win64 ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KA_K_K(a)Z(long) _vector_base_v4__Segment_index_of @ cdecl -arch=win32 ?_Setgloballocale(a)locale@std@@CAXPAX(a)Z(ptr) locale__Setgloballocale @ cdecl -arch=win64 ?_Setgloballocale(a)locale@std@@CAXPEAX(a)Z(ptr) locale__Setgloballocale @ cdecl -arch=arm ?_Swap_all(a)_Container_base0@std@@QAAXAAU12@@Z(ptr ptr) Container_base0_Swap_all diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index f88719f..c912202 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1735,8 +1735,8 @@ @ stub ?_Rethrow_future_exception(a)std@@YAXVexception_ptr(a)1@@Z @ stub -arch=win32 ?_Rng_abort(a)std@@YAXPBD(a)Z @ stub -arch=win64 ?_Rng_abort(a)std@@YAXPEBD(a)Z -@ stub -arch=win32 ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KAII(a)Z -@ stub -arch=win64 ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KA_K_K(a)Z +@ cdecl -arch=win32 ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KAII(a)Z(long) _vector_base_v4__Segment_index_of +@ cdecl -arch=win64 ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KA_K_K(a)Z(long) _vector_base_v4__Segment_index_of @ cdecl -arch=win32 ?_Setgloballocale(a)locale@std@@CAXPAX(a)Z(ptr) locale__Setgloballocale @ cdecl -arch=win64 ?_Setgloballocale(a)locale@std@@CAXPEAX(a)Z(ptr) locale__Setgloballocale @ stub -arch=win32 ?_Src@?1??_Getffldx@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABAHPADAAV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@3(a)1AAVios_base@3(a)PAH@Z(a)4QBDB diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index ae1ac57..61d7c7d 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1696,8 +1696,8 @@ @ stub ?_Rethrow_future_exception(a)std@@YAXVexception_ptr(a)1@@Z @ stub -arch=win32 ?_Rng_abort(a)std@@YAXPBD(a)Z @ stub -arch=win64 ?_Rng_abort(a)std@@YAXPEBD(a)Z -@ stub -arch=win32 ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KAII(a)Z -@ stub -arch=win64 ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KA_K_K(a)Z +@ cdecl -arch=win32 ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KAII(a)Z(long) _vector_base_v4__Segment_index_of +@ cdecl -arch=win64 ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KA_K_K(a)Z(long) _vector_base_v4__Segment_index_of @ cdecl -arch=win32 ?_Setgloballocale(a)locale@std@@CAXPAX(a)Z(ptr) locale__Setgloballocale @ cdecl -arch=win64 ?_Setgloballocale(a)locale@std@@CAXPEAX(a)Z(ptr) locale__Setgloballocale @ stub -arch=win32 ?_Src@?1??_Getffldx@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABAHPADAAV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@3(a)1AAVios_base@3(a)PAH@Z(a)4QBDB diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 56bed79..e63b3f7 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1696,8 +1696,8 @@ @ stub ?_Rethrow_future_exception(a)std@@YAXVexception_ptr(a)1@@Z @ stub -arch=win32 ?_Rng_abort(a)std@@YAXPBD(a)Z @ stub -arch=win64 ?_Rng_abort(a)std@@YAXPEBD(a)Z -@ stub -arch=win32 ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KAII(a)Z -@ stub -arch=win64 ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KA_K_K(a)Z +@ cdecl -arch=win32 ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KAII(a)Z(long) msvcp120.?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KAII(a)Z +@ cdecl -arch=win64 ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KA_K_K(a)Z(long) msvcp120.?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KA_K_K(a)Z @ cdecl -arch=win32 ?_Setgloballocale(a)locale@std@@CAXPAX(a)Z(ptr) msvcp120.?_Setgloballocale(a)locale@std@@CAXPAX(a)Z @ cdecl -arch=win64 ?_Setgloballocale(a)locale@std@@CAXPEAX(a)Z(ptr) msvcp120.?_Setgloballocale(a)locale@std@@CAXPEAX(a)Z @ stub -arch=win32 ?_Src@?1??_Getffldx@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABAHPADAAV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@3(a)1AAVios_base@3(a)PAH@Z(a)4QBDB diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 28d1af3..1dcc590 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1645,3 +1645,52 @@ _Ph _Ph_6 = {0}, _Ph_7 = {0}, _Ph_8 = {0}, _Ph_9 = {0}, _Ph_10 = {0}; _Ph _Ph_11 = {0}, _Ph_12 = {0}, _Ph_13 = {0}, _Ph_14 = {0}, _Ph_15 = {0}; _Ph _Ph_16 = {0}, _Ph_17 = {0}, _Ph_18 = {0}, _Ph_19 = {0}, _Ph_20 = {0}; #endif + +#if _MSVCP_VER >= 100 +/* based on wined3d_log2i from wined3d.h */ +/* Return the integer base-2 logarithm of (x|1). Result is 0 for x == 0. */ +static inline unsigned int log2i(unsigned int x) +{ +#ifdef HAVE___BUILTIN_CLZ + return __builtin_clz(x|1) ^ 0x1f; +#else + static const unsigned int l[] = + { + ~0u, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + }; + unsigned int i; + + x |= 1; + return (i = x >> 16) ? (x = i >> 8) ? l[x] + 24 : l[i] + 16 : (i = x >> 8) ? l[i] + 8 : l[x]; +#endif +} + +/* ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KAII(a)Z */ +/* ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KA_K_K(a)Z */ +MSVCP_size_t __cdecl _vector_base_v4__Segment_index_of(MSVCP_size_t x) +{ + unsigned int half; + + TRACE("(%lu)\n", x); + + if((sizeof(x) == 8) && (half = x >> 32)) + return log2i(half) + 32; + + return log2i(x); +} +#endif

1 0

Nikolay Sivov : gdiplus/tests: Test EMF+ records flags.
by Alexandre Julliard Oct. 11, 2017

Oct. 11, 2017

Module: wine Branch: master Commit: 1df5f2fab7d5f61a6ce55393128ab3a2241edd09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1df5f2fab7d5f61a6ce553931… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 10 21:24:38 2017 +0300 gdiplus/tests: Test EMF+ records flags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 422 ++++++++++++++++++++++-------------------- 1 file changed, 219 insertions(+), 203 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1df5f2fab7d5f61a6ce55…

1 0

Nikolay Sivov : gdiplus/metafile: Fix flags handling for EMF+ property records.
by Alexandre Julliard Oct. 11, 2017

Oct. 11, 2017

Module: wine Branch: master Commit: 30ba465786a92617f93cbd2237030b0a51ae0bc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30ba465786a92617f93cbd223… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 10 21:24:39 2017 +0300 gdiplus/metafile: Fix flags handling for EMF+ property records. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index d135e36..350925e 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1834,15 +1834,15 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, } case EmfPlusRecordTypeSetPixelOffsetMode: { - return GdipSetPixelOffsetMode(real_metafile->playback_graphics, (flags >> 8) & 0xf); + return GdipSetPixelOffsetMode(real_metafile->playback_graphics, flags & 0xff); } case EmfPlusRecordTypeSetCompositingQuality: { - return GdipSetCompositingQuality(real_metafile->playback_graphics, (flags >> 8) & 0xf); + return GdipSetCompositingQuality(real_metafile->playback_graphics, flags & 0xff); } case EmfPlusRecordTypeSetInterpolationMode: { - return GdipSetInterpolationMode(real_metafile->playback_graphics, (flags >> 8) & 0xf); + return GdipSetInterpolationMode(real_metafile->playback_graphics, flags & 0xff); } default: FIXME("Not implemented for record type %x\n", recordType);

1 0

Alexandre Julliard : opengl32: Generate thunks for WGL extensions when possible.
by Alexandre Julliard Oct. 11, 2017

Oct. 11, 2017

Module: wine Branch: master Commit: c4e9e3fcb94191979e56c6aad480bc6b72d47124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4e9e3fcb94191979e56c6aad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 11 16:12:17 2017 +0200 opengl32: Generate thunks for WGL extensions when possible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 134 ++++++++++++++++------------- dlls/opengl32/opengl_ext.c | 130 ++++++++++++++++++++++++++--- dlls/opengl32/opengl_ext.h | 17 ++-- dlls/opengl32/opengl_norm.c | 8 +- dlls/opengl32/wgl.c | 199 +------------------------------------------- 5 files changed, 212 insertions(+), 276 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4e9e3fcb94191979e56c…

1 0

Dmitry Kislyuk : vbscript: Improve parsing of separators after Option Explicit.
by Alexandre Julliard Oct. 11, 2017

Oct. 11, 2017

Module: wine Branch: master Commit: 5193b6fa69ee7efd8f68a3ac42f706cc1bc7c545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5193b6fa69ee7efd8f68a3ac4… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Tue Oct 10 04:31:42 2017 -0500 vbscript: Improve parsing of separators after Option Explicit. Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 2 +- dlls/vbscript/tests/lang.vbs | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index beb4e4c..dcd7b73 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -148,7 +148,7 @@ Program OptionExplicit_opt : /* empty */ { $$ = FALSE; } - | tOPTION tEXPLICIT tNL { $$ = TRUE; } + | tOPTION tEXPLICIT StSep { $$ = TRUE; } SourceElements : /* empty */ diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 7c83b74..8ee92a6 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -16,7 +16,7 @@ ' Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA ' -Option Explicit +OPTION EXPLICIT : : DIM W dim x, y, z Dim obj @@ -53,6 +53,9 @@ Call ok(false = 0, "false <> 0") Call ok(&hff = 255, "&hff <> 255") Call ok(&Hff = 255, "&Hff <> 255") +W = 5 +Call ok(W = 5, "W = " & W & " expected " & 5) + x = "xx" Call ok(x = "xx", "x = " & x & " expected ""xx""")

1 0

Daniel Lehman : msvcp120/tests: Add tests for concurrent_vector:: _Segment_index_of.
by Alexandre Julliard Oct. 11, 2017

Oct. 11, 2017

Module: wine Branch: master Commit: 467d38787bcbbba0b3f8f146af38c0c6fce9a4c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=467d38787bcbbba0b3f8f146a… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Oct 10 09:26:49 2017 -0700 msvcp120/tests: Add tests for concurrent_vector::_Segment_index_of. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index cd7d457..62165e9 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -276,6 +276,8 @@ static void (__cdecl *p_threads__Mtx_unlock)(void *mtx); static BOOLEAN (WINAPI *pCreateSymbolicLinkA)(LPCSTR,LPCSTR,DWORD); +static size_t (__cdecl *p_vector_base_v4__Segment_index_of)(size_t); + static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -391,6 +393,8 @@ static BOOL init(void) "?_Mtx_lock(a)threads@stdext@@YAXPEAX(a)Z"); SET(p_threads__Mtx_unlock, "?_Mtx_unlock(a)threads@stdext@@YAXPEAX(a)Z"); + SET(p_vector_base_v4__Segment_index_of, + "?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KA_K_K(a)Z"); } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); @@ -460,6 +464,8 @@ static BOOL init(void) "?_Mtx_lock(a)threads@stdext@@YAXPAX(a)Z"); SET(p_threads__Mtx_unlock, "?_Mtx_unlock(a)threads@stdext@@YAXPAX(a)Z"); + SET(p_vector_base_v4__Segment_index_of, + "?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KAII(a)Z"); #ifdef __i386__ SET(p_i386_Thrd_current, "_Thrd_current"); @@ -2093,6 +2099,35 @@ static void test_threads__Mtx(void) p_threads__Mtx_delete(mtx); } +static void test_vector_base_v4__Segment_index_of(void) +{ + size_t i; + size_t ret; + struct { + size_t x; + size_t expect; + } tests[] = { + {0, 0}, + {1, 0}, + {2, 1}, + {3, 1}, + {4, 2}, + {7, 2}, + {8, 3}, + {15, 3}, + {16, 4}, + {31, 4}, + {32, 5}, + {~0, 8*sizeof(void*)-1} + }; + + for(i=0; i<sizeof(tests) / sizeof(tests[0]); i++) { + ret = p_vector_base_v4__Segment_index_of(tests[i].x); + ok(ret == tests[i].expect, "expected %ld, got %ld for %ld\n", + (long)tests[i].expect, (long)ret, (long)tests[i].x); + } +} + START_TEST(msvcp120) { if(!init()) return; @@ -2126,6 +2161,8 @@ START_TEST(msvcp120) test__Pad(); test_threads__Mtx(); + test_vector_base_v4__Segment_index_of(); + test_vbtable_size_exports(); FreeLibrary(msvcp);

1 0

Francois Gouget : testbot: Tweak the scripts so they print error messages on stderr by default.
by Alexandre Julliard Oct. 11, 2017

Oct. 11, 2017

Module: tools Branch: master Commit: 9efe233073c826b5dffe3bcb145bc1d982d3aa0d URL: http://source.winehq.org/git/tools.git/?a=commit;h=9efe233073c826b5dffe3bcb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 10 23:56:51 2017 +0200 testbot: Tweak the scripts so they print error messages on stderr by default. When the scripts are started by the Engine their stderr is redirected to the log in order to also capture Perl errors. Since the scripts always log error messages, to avoid getting duplicates they were only printing errors to stderr if given the --debug option. As a result usage errors were not printed by default. So the scripts now print the messages to stderr by default and the Engine can invoke them with the --log-only option where needed to avoid the stderr duplicates. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 9 +++++++-- testbot/bin/WineRunBuild.pl | 9 +++++++-- testbot/bin/WineRunReconfig.pl | 9 +++++++-- testbot/bin/WineRunTask.pl | 9 +++++++-- testbot/lib/WineTestBot/Tasks.pm | 2 +- testbot/lib/WineTestBot/VMs.pm | 2 +- 6 files changed, 30 insertions(+), 10 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index aa256f3..358eebf 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -51,9 +51,10 @@ sub Debug(@) print STDERR @_ if ($Debug); } +my $LogOnly; sub Error(@) { - Debug("$Name0:error: ", @_); + print STDERR "$Name0:error: ", @_ if (!$LogOnly); LogMsg @_; } @@ -99,6 +100,10 @@ while (@ARGV) { $Debug = 1; } + elsif ($Arg eq "--log-only") + { + $LogOnly = 1; + } elsif ($Arg eq "revert") { $Action = $Arg; @@ -158,7 +163,7 @@ if (!defined $Usage) } if (defined $Usage) { - print "Usage: $Name0 [--debug] [--help] revert VMName\n"; + print "Usage: $Name0 [--debug] [--log-only] [--help] revert VMName\n"; exit $Usage; } diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 85fe568..f385fee 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -54,9 +54,10 @@ sub Debug(@) print STDERR @_ if ($Debug); } +my $LogOnly; sub Error(@) { - Debug("$Name0:error: ", @_); + print STDERR "$Name0:error: ", @_ if (!$LogOnly); LogMsg @_; } @@ -88,6 +89,10 @@ while (@ARGV) { $Debug = 1; } + elsif ($Arg eq "--log-only") + { + $LogOnly = 1; + } elsif ($Arg =~ /^(?:-\?|-h|--help)$/) { $Usage = 0; @@ -130,7 +135,7 @@ if (!defined $Usage) } if (defined $Usage) { - print "Usage: $Name0 [--debug] [--help] JobId StepNo TaskNo\n"; + print "Usage: $Name0 [--debug] [--log-only] [--help] JobId StepNo TaskNo\n"; exit $Usage; } diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index b2071cd..aa529a2 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -54,9 +54,10 @@ sub Debug(@) print STDERR @_ if ($Debug); } +my $LogOnly; sub Error(@) { - Debug("$Name0:error: ", @_); + print STDERR "$Name0:error: ", @_ if (!$LogOnly); LogMsg @_; } @@ -88,6 +89,10 @@ while (@ARGV) { $Debug = 1; } + elsif ($Arg eq "--log-only") + { + $LogOnly = 1; + } elsif ($Arg =~ /^(?:-\?|-h|--help)$/) { $Usage = 0; @@ -130,7 +135,7 @@ if (!defined $Usage) } if (defined $Usage) { - print "Usage: $Name0 [--debug] [--help] JobId StepNo TaskNo\n"; + print "Usage: $Name0 [--debug] [--log-only] [--help] JobId StepNo TaskNo\n"; exit $Usage; } diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 2328b31..fc0bcf3 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -53,9 +53,10 @@ sub Debug(@) print STDERR @_ if ($Debug); } +my $LogOnly; sub Error(@) { - Debug("$Name0:error: ", @_); + print STDERR "$Name0:error: ", @_ if (!$LogOnly); LogMsg @_; } @@ -113,6 +114,10 @@ while (@ARGV) { $Debug = 1; } + elsif ($Arg eq "--log-only") + { + $LogOnly = 1; + } elsif ($Arg =~ /^(?:-\?|-h|--help)$/) { $Usage = 0; @@ -155,7 +160,7 @@ if (!defined $Usage) } if (defined $Usage) { - print "Usage: $Name0 [--debug] [--help] JobId StepNo TaskNo\n"; + print "Usage: $Name0 [--debug] [--log-only] [--help] JobId StepNo TaskNo\n"; exit $Usage; } diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 520d403..b4298fb 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -128,7 +128,7 @@ sub Run($$) } $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; - exec("$BinDir/${ProjectName}$RunScript", $JobId, $StepNo, $TaskNo) or + exec("$BinDir/${ProjectName}$RunScript", "--log-only", $JobId, $StepNo, $TaskNo) or require WineTestBot::Log; WineTestBot::Log::LogMsg("Unable to exec ${ProjectName}$RunScript: $!\n"); exit(1); diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 1c6cdd7..af052d9 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -276,7 +276,7 @@ sub RunRevert($) delete $ENV{ENV}; require WineTestBot::Log; WineTestBot::Log::SetupRedirects(); - exec("$BinDir/LibvirtTool.pl", "revert", $self->GetKey()) or + exec("$BinDir/LibvirtTool.pl", "--log-only", "revert", $self->GetKey()) or WineTestBot::Log::LogMsg("Unable to exec LibvirtTool.pl: $!\n"); exit(1); }

1 0

Francois Gouget : testbot: Remove redundant calls to RescheduleJobs().
by Alexandre Julliard Oct. 11, 2017

Oct. 11, 2017

Module: tools Branch: master Commit: 1ae97e538a6dbfbc6a3b96bcaa5866f333f027ee URL: http://source.winehq.org/git/tools.git/?a=commit;h=1ae97e538a6dbfbc6a3b96bc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 10 23:56:44 2017 +0200 testbot: Remove redundant calls to RescheduleJobs(). Modifying a VM's Status field already triggers a rescheduling ($VM->Save() triggers $VM->OnSaved() which calls VMStatusChange() to notify the Engine's HandleVMStatusChange() which calls ScheduleJobs()). So there is no need to call RescheduleJobs() right after saving the VM's new status. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 1 - testbot/bin/WineRunReconfig.pl | 1 - testbot/bin/WineRunTask.pl | 1 - 3 files changed, 3 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 326ac0c..85fe568 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -241,7 +241,6 @@ sub WrapUpAndExit($;$) { $VM->Status($NewVMStatus); $VM->Save(); - RescheduleJobs(); } my $Result = $VM->Name .": ". $VM->Status ." Status: $Status Failures: ". (defined $TestFailures ? $TestFailures : "unset"); diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index d8e007d..b2071cd 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -242,7 +242,6 @@ sub WrapUpAndExit($;$) { $VM->Status($NewVMStatus); $VM->Save(); - RescheduleJobs(); } my $Result = $VM->Name .": ". $VM->Status ." Status: $Status Failures: ". (defined $TestFailures ? $TestFailures : "unset"); diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 618ef8f..2328b31 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -270,7 +270,6 @@ sub WrapUpAndExit($;$$) { $VM->Status($NewVMStatus); $VM->Save(); - RescheduleJobs(); } if ($Status eq 'completed' and $Step->Type eq 'suite')

1 0

Francois Gouget : testbot: Fix a check for reverting VMs on the Engine startup.
by Alexandre Julliard Oct. 11, 2017

Oct. 11, 2017

Module: tools Branch: master Commit: fd5d3d4f40f2b5ceb103832ea25b2bc0e0c90076 URL: http://source.winehq.org/git/tools.git/?a=commit;h=fd5d3d4f40f2b5ceb103832e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 10 23:56:26 2017 +0200 testbot: Fix a check for reverting VMs on the Engine startup. If the Engine was starting up while a VM was reverting, it would power off that VM instead of letting the revert run its course. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 34d29f6..ee496e2 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -195,7 +195,7 @@ sub Cleanup(;$$) next; } elsif (($VM->Status eq "reverting" or $VM->Status eq "sleeping") and - defined $VM->ChildPid and kill(0, $VM->ChildPid)) + defined $VM->ChildPid and !kill(0, $VM->ChildPid)) { # This VM is still being reverted. Let that process run its course. LogMsg "$VMKey is being reverted\n";

1 0