October 2017 - Wine-commits

Francois Gouget : testbot: Improve the Jobs error handling and documentation.
by Alexandre Julliard 12 Oct '17

12 Oct '17

Module: tools Branch: master Commit: 006258002477b9b2bc86f03e5641eefc34d6ec32 URL: http://source.winehq.org/git/tools.git/?a=commit;h=006258002477b9b2bc86f03e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 11 16:18:03 2017 +0200 testbot: Improve the Jobs error handling and documentation. Specifically in the UpdateStatus(), Cancel() and Restart() methods. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 50 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 9976794..c26ff92 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -123,6 +123,8 @@ Updates the status of this job and of its steps and tasks. Part of this means checking for failed builds and skipping the subsequent tasks, or detecting dead child processes. +Returns the updated status. + =back =cut @@ -183,9 +185,27 @@ sub UpdateStatus($) return $Status; } +=pod +=over 12 + +=item C<Cancel()> + +Cancels the Job, preserving existing results. + +More precisely, goes through all of that Job's 'queued' and 'running' tasks, +killing all the running ones and marking them, and all the queued tasks, as +'skipped' so they will not be run. The overall Job status will be 'canceled' +unless it was completed already. + +Returns undef if successful, the error message otherwise. + +=back +=cut + sub Cancel($) { my ($self) = @_; + my $ErrMessage; my $Steps = $self->Steps; $Steps->AddFilter("Status", ["queued", "running"]); @@ -198,7 +218,8 @@ sub Cancel($) if ($Task->Status eq "queued") { $Task->Status("skipped"); - $Task->Save(); + my ($EProperty, $EMessage) = $Task->Save(); + $ErrMessage ||= "$EMessage ($EProperty)" if ($EMessage); } elsif (defined $Task->ChildPid) { @@ -207,20 +228,38 @@ sub Cancel($) kill("TERM", $Task->ChildPid); $Task->Status("canceled"); $Task->ChildPid(undef); - $Task->Save(); + my ($EProperty, $EMessage) = $Task->Save(); + $ErrMessage ||= "$EMessage ($EProperty)" if ($EMessage); my $VM = $Task->VM; $VM->Status('dirty'); - $VM->Save(); + ($EProperty, $EMessage) = $VM->Save(); + $ErrMessage ||= "$EMessage ($EProperty)" if ($EMessage); } } } # Let UpdateStatus() handle updating the overall job status $self->UpdateStatus(); - return undef; + return $ErrMessage; } +=pod +=over 12 + +=item C<Restart()> + +Restarts the Job from scratch. + +More precisely, if the Job is not 'queued' or 'running', goes through all of +its tasks and marks them all as 'queued', deleting any existing result in the +process. + +Returns undef if successful, the error message otherwise. + +=back +=cut + sub Restart($) { my ($self) = @_; @@ -259,7 +298,8 @@ sub Restart($) $self->Status("queued"); $self->Submitted(time); $self->Ended(undef); - $self->Save(); # Save it all + my ($ErrProperty, $ErrMessage) = $self->Save(); # Save it all + return "$ErrMessage ($ErrProperty)" if ($ErrMessage); return undef; }

1 0

Daniel Lehman : msvcp120: Implement concurrent_vector::_Segment_index_of.
by Alexandre Julliard 11 Oct '17

11 Oct '17

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

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

11 Oct '17

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

Nikolay Sivov : comctl32/tests: Remove some old workarounds for platforms we don't test on anymore.
by Alexandre Julliard 11 Oct '17

11 Oct '17

Module: wine Branch: master Commit: 2c6c5e0d055007d8a766978f56e4458c3ffc0589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6c5e0d055007d8a766978f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 11 12:54:58 2017 +0300 comctl32/tests: Remove some old workarounds for platforms we don't test on anymore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 47 ++++++------------------------------------ 1 file changed, 6 insertions(+), 41 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0c1d878..dce253c 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1545,15 +1545,6 @@ static void test_create(void) hList = CreateWindowA("MyListView32", "Test", WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); ok((HIMAGELIST)SendMessageA(hList, LVM_GETIMAGELIST, 0, 0) == test_create_imagelist, "Image list not obtained\n"); hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0); - - if (!IsWindow(hHeader)) - { - /* version 4.0 */ - win_skip("LVM_GETHEADER not implemented. Skipping.\n"); - DestroyWindow(hList); - return; - } - ok(IsWindow(hHeader) && IsWindowVisible(hHeader), "Listview not in report mode\n"); ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); DestroyWindow(hList); @@ -1939,13 +1930,6 @@ static void test_icon_spacing(void) "Expected %d, got %d\n", MAKELONG(w, h), r); r = SendMessageA(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(25, 35)); - if (r == 0) - { - /* version 4.0 */ - win_skip("LVM_SETICONSPACING unimplemented. Skipping.\n"); - DestroyWindow(hwnd); - return; - } expect(MAKELONG(20,30), r); r = SendMessageA(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(-1,-1)); @@ -4394,19 +4378,11 @@ static void test_notifyformat(void) r = SendMessageA(hwnd, LVM_SETUNICODEFORMAT, 1, 0); expect(0, r); r = SendMessageA(hwnd, LVM_GETUNICODEFORMAT, 0, 0); - if (r == 1) - { - r = SendMessageA(hwnd, LVM_SETUNICODEFORMAT, 0, 0); - expect(1, r); - r = SendMessageA(hwnd, LVM_GETUNICODEFORMAT, 0, 0); - expect(0, r); - } - else - { - win_skip("LVM_GETUNICODEFORMAT is unsupported\n"); - DestroyWindow(hwnd); - return; - } + ok(r == 1, "Unexpected return value %d.\n", r); + r = SendMessageA(hwnd, LVM_SETUNICODEFORMAT, 0, 0); + expect(1, r); + r = SendMessageA(hwnd, LVM_GETUNICODEFORMAT, 0, 0); + expect(0, r); DestroyWindow(hwnd); @@ -5011,12 +4987,7 @@ static void test_approximate_viewrect(void) expect(0, ret); ret = SendMessageA(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(75, 75)); - if (ret == 0) - { - /* version 4.0 */ - win_skip("LVM_SETICONSPACING unimplemented. Skipping.\n"); - return; - } + ok(ret != 0, "Unexpected return value %#x.\n", ret); ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 11, MAKELPARAM(100,100)); expect(MAKELONG(77,827), ret); @@ -5110,12 +5081,6 @@ static void test_finditem(void) fi.flags = LVFI_SUBSTRING; fi.psz = f; r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); - if (r == -1) - { - win_skip("LVFI_SUBSTRING not supported\n"); - DestroyWindow(hwnd); - return; - } expect(0, r); strcpy(f, "f"); fi.flags = LVFI_SUBSTRING;

1 0

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

11 Oct '17

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

Piotr Caban : vbscript: Reimplement array_access function.
by Alexandre Julliard 11 Oct '17

11 Oct '17

Module: wine Branch: master Commit: 0b5473c166d0fca9c71080e688c85a6580c4cb0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b5473c166d0fca9c71080e68… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 10 17:08:46 2017 +0200 vbscript: Reimplement array_access function. 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/interp.c | 45 ++++++++++++++++++++++---------------------- dlls/vbscript/tests/lang.vbs | 2 ++ 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 02180d9..feb8119 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -481,10 +481,8 @@ static void vbstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, BOOL is_propput, DI static HRESULT array_access(exec_ctx_t *ctx, SAFEARRAY *array, DISPPARAMS *dp, VARIANT **ret) { - unsigned cell_off = 0, dim_size = 1, i; - unsigned argc = arg_cnt(dp); - VARIANT *data; - LONG idx; + unsigned i, argc = arg_cnt(dp); + LONG *indices; HRESULT hres; if(!array) { @@ -492,34 +490,35 @@ static HRESULT array_access(exec_ctx_t *ctx, SAFEARRAY *array, DISPPARAMS *dp, V return E_FAIL; } + hres = SafeArrayLock(array); + if(FAILED(hres)) + return hres; + if(array->cDims != argc) { FIXME("argc %d does not match cDims %d\n", dp->cArgs, array->cDims); + SafeArrayUnlock(array); return E_FAIL; } - for(i=0; i < argc; i++) { - hres = to_int(get_arg(dp, i), &idx); - if(FAILED(hres)) - return hres; + indices = heap_alloc(sizeof(*indices) * argc); + if(!indices) { + SafeArrayUnlock(array); + return E_OUTOFMEMORY; + } - idx -= array->rgsabound[i].lLbound; - if(idx >= array->rgsabound[i].cElements) { - FIXME("out of bound element %d in dim %d of size %d\n", idx, i+1, array->rgsabound[i].cElements); - return E_FAIL; + for(i=0; i<argc; i++) { + hres = to_int(get_arg(dp, i), indices+i); + if(FAILED(hres)) { + heap_free(indices); + SafeArrayUnlock(array); + return hres; } - - cell_off += idx*dim_size; - dim_size *= array->rgsabound[i].cElements; } - hres = SafeArrayAccessData(array, (void**)&data); - if(FAILED(hres)) - return hres; - - *ret = data+cell_off; - - SafeArrayUnaccessData(array); - return S_OK; + hres = SafeArrayPtrOfIndex(array, indices, (void**)ret); + SafeArrayUnlock(array); + heap_free(indices); + return hres; } static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index a90dfc8..7c83b74 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1157,6 +1157,8 @@ arr3(3,2,1) = 1 arr3(1,2,3) = 2 Call ok(arr3(3,2,1) = 1, "arr3(3,2,1) = " & arr3(3,2,1)) Call ok(arr3(1,2,3) = 2, "arr3(1,2,3) = " & arr3(1,2,3)) +arr2(4,3) = 1 +Call ok(arr2(4,3) = 1, "arr2(4,3) = " & arr2(4,3)) x = arr3 Call ok(x(3,2,1) = 1, "x(3,2,1) = " & x(3,2,1))

1 0

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

11 Oct '17

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

Alexandre Julliard : opengl32: Only output enums for supported extensions, including WGL ones.
by Alexandre Julliard 11 Oct '17

11 Oct '17

Module: wine Branch: master Commit: 278c89a8468f7e0c7cc1dee037e1d3311122e56d URL: http://source.winehq.org/git/wine.git/?a=commit;h=278c89a8468f7e0c7cc1dee03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 11 14:39:50 2017 +0200 opengl32: Only output enums for supported extensions, including WGL ones. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 57 +- dlls/opengl32/tests/opengl.c | 22 - include/wine/wgl.h | 10804 +++++++++++++++++++---------------------- 3 files changed, 5072 insertions(+), 5811 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=278c89a8468f7e0c7cc1d…

1 0

Alexandre Julliard : opengl32: Generate thunks for WGL extensions when possible.
by Alexandre Julliard 11 Oct '17

11 Oct '17

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

Alexandre Julliard : include: Get rid of wglext.h.
by Alexandre Julliard 11 Oct '17

11 Oct '17

Module: wine Branch: master Commit: 5632c82c4246208f04f7e78af8c0598d55eede52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5632c82c4246208f04f7e78af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 11 17:48:57 2017 +0200 include: Get rid of wglext.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/opengl.c | 1 - dlls/wined3d/wined3d_gl.h | 1 - dlls/winemac.drv/opengl.c | 1 - dlls/winex11.drv/opengl.c | 1 - include/wine/wglext.h | 915 ------------------------------------------ 5 files changed, 919 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5632c82c4246208f04f7e…

1 0