June 2018 - Wine-commits - list.winehq.org

Dmitry Timoshkov : schedsvc: Read triggers when loading a job file.
by Alexandre Julliard 06 Jun '18

06 Jun '18

Module: wine Branch: master Commit: a3566fd6e189f803477839a7444f8418f59fd99c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3566fd6e189f803477839a7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 6 14:34:24 2018 +0800 schedsvc: Read triggers when loading a job file. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/atsvc.c | 61 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 9497c90..8f6cf03 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -64,6 +64,8 @@ struct job_t AT_ENUM info; FIXDLEN_DATA data; USHORT instance_count; + USHORT trigger_count; + TASK_TRIGGER *trigger; }; struct running_job_t @@ -143,7 +145,7 @@ static BOOL load_job_data(const char *data, DWORD size, struct job_t *info) const FIXDLEN_DATA *fixed; const SYSTEMTIME *st; DWORD unicode_strings_size, data_size, triggers_size; - USHORT triggers_count, i; + USHORT i; const USHORT *signature; const TASK_TRIGGER *trigger; @@ -202,11 +204,10 @@ static BOOL load_job_data(const char *data, DWORD size, struct job_t *info) TRACE("no space for triggers count\n"); return FALSE; } - triggers_count = *(const USHORT *)(data + fixed->trigger_offset); - TRACE("triggers_count %u\n", triggers_count); + info->trigger_count = *(const USHORT *)(data + fixed->trigger_offset); + TRACE("trigger_count %u\n", info->trigger_count); triggers_size = size - fixed->trigger_offset - sizeof(USHORT); TRACE("triggers_size %u\n", triggers_size); - trigger = (const TASK_TRIGGER *)(data + fixed->trigger_offset + sizeof(USHORT)); data += fixed->name_size_offset + unicode_strings_size; size -= fixed->name_size_offset + unicode_strings_size; @@ -249,42 +250,51 @@ static BOOL load_job_data(const char *data, DWORD size, struct job_t *info) /* Trigger Data */ TRACE("trigger_offset %04x, triggers end at %04x\n", fixed->trigger_offset, - (DWORD)(fixed->trigger_offset + sizeof(USHORT) + triggers_count * sizeof(TASK_TRIGGER))); + (DWORD)(fixed->trigger_offset + sizeof(USHORT) + info->trigger_count * sizeof(TASK_TRIGGER))); - triggers_count = *(const USHORT *)data; - TRACE("triggers_count %u\n", triggers_count); + info->trigger_count = *(const USHORT *)data; + TRACE("trigger_count %u\n", info->trigger_count); trigger = (const TASK_TRIGGER *)(data + sizeof(USHORT)); - if (triggers_count * sizeof(TASK_TRIGGER) > triggers_size) + if (info->trigger_count * sizeof(TASK_TRIGGER) > triggers_size) { TRACE("no space for triggers data\n"); return FALSE; } - for (i = 0; i < triggers_count; i++) + info->trigger = heap_alloc(info->trigger_count * sizeof(info->trigger[0])); + if (!info->trigger) + { + TRACE("not enough memory for trigger data\n"); + return FALSE; + } + + for (i = 0; i < info->trigger_count; i++) { TRACE("%u: cbTriggerSize = %#x\n", i, trigger[i].cbTriggerSize); if (trigger[i].cbTriggerSize != sizeof(TASK_TRIGGER)) TRACE("invalid cbTriggerSize\n"); TRACE("Reserved1 = %#x\n", trigger[i].Reserved1); - TRACE("wBeginYear = %u\n", trigger->wBeginYear); - TRACE("wBeginMonth = %u\n", trigger->wBeginMonth); - TRACE("wBeginDay = %u\n", trigger->wBeginDay); - TRACE("wEndYear = %u\n", trigger->wEndYear); - TRACE("wEndMonth = %u\n", trigger->wEndMonth); - TRACE("wEndDay = %u\n", trigger->wEndDay); - TRACE("wStartHour = %u\n", trigger->wStartHour); - TRACE("wStartMinute = %u\n", trigger->wStartMinute); - TRACE("MinutesDuration = %u\n", trigger->MinutesDuration); - TRACE("MinutesInterval = %u\n", trigger->MinutesInterval); - TRACE("rgFlags = %u\n", trigger->rgFlags); - TRACE("TriggerType = %u\n", trigger->TriggerType); - TRACE("Reserved2 = %u\n", trigger->Reserved2); - TRACE("wRandomMinutesInterval = %u\n", trigger->wRandomMinutesInterval); + TRACE("wBeginYear = %u\n", trigger[i].wBeginYear); + TRACE("wBeginMonth = %u\n", trigger[i].wBeginMonth); + TRACE("wBeginDay = %u\n", trigger[i].wBeginDay); + TRACE("wEndYear = %u\n", trigger[i].wEndYear); + TRACE("wEndMonth = %u\n", trigger[i].wEndMonth); + TRACE("wEndDay = %u\n", trigger[i].wEndDay); + TRACE("wStartHour = %u\n", trigger[i].wStartHour); + TRACE("wStartMinute = %u\n", trigger[i].wStartMinute); + TRACE("MinutesDuration = %u\n", trigger[i].MinutesDuration); + TRACE("MinutesInterval = %u\n", trigger[i].MinutesInterval); + TRACE("rgFlags = %u\n", trigger[i].rgFlags); + TRACE("TriggerType = %u\n", trigger[i].TriggerType); + TRACE("Reserved2 = %u\n", trigger[i].Reserved2); + TRACE("wRandomMinutesInterval = %u\n", trigger[i].wRandomMinutesInterval); + + info->trigger[i] = trigger[i]; } - size -= sizeof(USHORT) + triggers_count * sizeof(TASK_TRIGGER); - data += sizeof(USHORT) + triggers_count * sizeof(TASK_TRIGGER); + size -= sizeof(USHORT) + info->trigger_count * sizeof(TASK_TRIGGER); + data += sizeof(USHORT) + info->trigger_count * sizeof(TASK_TRIGGER); if (size < 2 * sizeof(USHORT) + 64) { @@ -353,6 +363,7 @@ static void free_job(struct job_t *job) heap_free(job->name); heap_free(job->params); heap_free(job->curdir); + heap_free(job->trigger); heap_free(job); }

1 0

Francois Gouget : testbot: Make Step::FileName and FileType optional.
by Alexandre Julliard 06 Jun '18

06 Jun '18

Module: tools Branch: master Commit: 3675d116dd9a41bce64f3ffb33a21c70e4aeb585 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3675d116dd9a41bce64f3ff… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 5 10:53:39 2018 +0200 testbot: Make Step::FileName and FileType optional. Some steps don't have an input filename (like the Reconfig tasks) so it makes no sense to force setting FileName or FileType to a dummy value. However enum fields cannot be left undefined so add a 'none' value. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 3 +-- testbot/ddl/update35.sql | 5 +++++ testbot/ddl/winetestbot.sql | 4 ++-- testbot/lib/WineTestBot/Steps.pm | 11 +++++++++-- testbot/lib/WineTestBot/StepsTasks.pm | 4 +++- testbot/web/JobDetails.pl | 2 +- 6 files changed, 21 insertions(+), 8 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index a79f60c..f41148f 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -251,8 +251,7 @@ sub AddReconfigJob() my $Steps = $NewJob->Steps; my $NewStep = $Steps->Add(); $NewStep->Type("reconfig"); - $NewStep->FileName("-"); - $NewStep->FileType("patchdlls"); + $NewStep->FileType("none"); $NewStep->InStaging(!1); # Add a task for the build VM diff --git a/testbot/ddl/update35.sql b/testbot/ddl/update35.sql new file mode 100644 index 0000000..3ca3023 --- /dev/null +++ b/testbot/ddl/update35.sql @@ -0,0 +1,5 @@ +USE winetestbot; + +ALTER TABLE Steps + MODIFY FileName VARCHAR(100) NULL, + MODIFY FileType ENUM('none', 'exe32', 'exe64', 'patchdlls', 'patchprograms') NOT NULL; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 9ec428c..9a28385 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -132,8 +132,8 @@ CREATE TABLE Steps PreviousNo INT(2) NULL, Type ENUM('suite', 'single', 'build', 'reconfig') NOT NULL, Status ENUM('queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped') NOT NULL, - FileName VARCHAR(100) NOT NULL, - FileType ENUM('exe32', 'exe64', 'patchdlls', 'patchprograms') NOT NULL, + FileName VARCHAR(100) NULL, + FileType ENUM('none', 'exe32', 'exe64', 'patchdlls', 'patchprograms') NOT NULL, InStaging ENUM('Y', 'N') NOT NULL, DebugLevel INT(2) NOT NULL, ReportSuccessfulTests ENUM('Y', 'N') NOT NULL, diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 9774194..aea1aee 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -89,6 +89,7 @@ sub InitializeNew($$) $self->Status("queued"); $self->Type("single"); + $self->FileType("none"); $self->InStaging(1); $self->DebugLevel(1); $self->ReportSuccessfulTests(!1); @@ -117,6 +118,10 @@ sub Validate($) { return ("PreviousNo", "The previous step number must be less than this one's."); } + if (defined $self->FileName and $self->FileType eq "none") + { + return ("FileType", "A file has been specified but no FileType"); + } return $self->SUPER::Validate(); } @@ -146,6 +151,8 @@ sub GetFullFileName($) { my ($self) = @_; + return undef if (!defined $self->FileName); + my ($JobId, $StepNo) = @{$self->GetMasterKey()}; # FIXME: Remove legacy support once no such job remains (so after # $JobPurgeDays). @@ -256,8 +263,8 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("PreviousNo", "Previous step", !1, !1, "N", 2), CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped']), CreateEnumPropertyDescriptor("Type", "Step type", !1, 1, ['suite', 'single', 'build', 'reconfig']), - CreateBasicPropertyDescriptor("FileName", "File name", !1, 1, "A", 100), - CreateEnumPropertyDescriptor("FileType", "File type", !1, 1, ['exe32', 'exe64', 'patchdlls', 'patchprograms']), + CreateBasicPropertyDescriptor("FileName", "File name", !1, !1, "A", 100), + CreateEnumPropertyDescriptor("FileType", "File type", !1, 1, ['none', 'exe32', 'exe64', 'patchdlls', 'patchprograms']), CreateBasicPropertyDescriptor("InStaging", "File is in staging area", !1, 1, "B", 1), CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1), diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index b9f70d7..84c5a00 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -44,6 +44,8 @@ sub GetFullFileName($) { my ($self) = @_; + return undef if (!defined $self->FileName); + my ($JobId, $_StepTaskId) = @{$self->GetMasterKey()}; # FIXME: Remove legacy support once no such job remains (so after # $JobPurgeDays). @@ -189,7 +191,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Status", "Status", !1, 1, "A", 32), CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), - CreateBasicPropertyDescriptor("FileName", "File name", !1, 1, "A", 100), + CreateBasicPropertyDescriptor("FileName", "File name", !1, !1, "A", 100), CreateBasicPropertyDescriptor("FileType", "File Type", !1, 1, "A", 32), CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 6bf4a12..3e638f7 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -486,7 +486,7 @@ sub GenerateDataCell($$$$$) elsif ($PropertyName eq "FileName") { my $FileName = $StepTask->GetFullFileName(); - if (-r $FileName) + if ($FileName and -r $FileName) { my $URI = "/GetFile.pl?JobKey=" . uri_escape($self->{JobId}) . "&StepKey=" . uri_escape($StepTask->StepNo);

1 0

Francois Gouget : testbot: Add proper command line options to CheckForWinetestUpdate.pl.
by Alexandre Julliard 06 Jun '18

06 Jun '18

Module: tools Branch: master Commit: ebb29be63586479c2ba2c963912014bdbe3527c9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ebb29be63586479c2ba2c96… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 5 10:50:13 2018 +0200 testbot: Add proper command line options to CheckForWinetestUpdate.pl. The options make it possible to test a specific job/task creation without having to way for a new WineTest binary download each time. Also it is now possible to specify the exact task type to create and if none is given the script will now handle all of them. This way the crontab commands don't need to be updated when new task types are added. Also the script now prints the error messages to stderr by default to make it easier to figure things out when running it on the command line. The --log-only option can be used when that's not desired. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 273 ++++++++++++++++++++++++---------- testbot/doc/INSTALL.txt | 3 +- 2 files changed, 199 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=ebb29be63586479c2ba…

1 0

Francois Gouget : testbot: Log errors that happen when updating a Job' s status.
by Alexandre Julliard 06 Jun '18

06 Jun '18

Module: tools Branch: master Commit: 49f73ecbab8cbe8894895c9f9a8f8ee0b70b7147 URL: https://source.winehq.org/git/tools.git/?a=commit;h=49f73ecbab8cbe8894895c9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 5 10:52:34 2018 +0200 testbot: Log errors that happen when updating a Job's status. Such errors are important as they can prevent the Jobs from ever being marked as completed. So trace them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index b1ffd3e..13a3895 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -243,7 +243,12 @@ sub UpdateStatus($) { $self->Ended(time); } - $self->Save(); + my ($ErrProperty, $ErrMessage) = $self->Save(); + if (defined $ErrMessage) + { + require WineTestBot::Log; + WineTestBot::Log::LogMsg("Could not update job status: $ErrMessage\n"); + } last; } }

1 0

Alexandre Julliard : user32: Only pass the new valid rectangle to the server.
by Alexandre Julliard 05 Jun '18

05 Jun '18

Module: wine Branch: master Commit: 026309888c8e6b6186491c2f748a7876e4aaf04f URL: https://source.winehq.org/git/wine.git/?a=commit;h=026309888c8e6b6186491c2f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 5 17:19:53 2018 +0200 user32: Only pass the new valid rectangle to the server. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 10 +++++----- server/window.c | 22 +++++++++------------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index d527409..c792b0e 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2080,6 +2080,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, window_rect, client_rect, &visible_rect, &new_surface ); WIN_GetRectangles( hwnd, COORDS_SCREEN, &old_window_rect, NULL ); + if (IsRectEmpty( &valid_rects[0] )) valid_rects = NULL; if (!(win = WIN_GetPtr( hwnd )) || win == WND_DESKTOP || win == WND_OTHER_PROCESS) { @@ -2104,11 +2105,10 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, req->client.top = client_rect->top; req->client.right = client_rect->right; req->client.bottom = client_rect->bottom; - if (!EqualRect( window_rect, &visible_rect ) || !IsRectEmpty( &valid_rects[0] )) + if (!EqualRect( window_rect, &visible_rect ) || valid_rects) { wine_server_add_data( req, &visible_rect, sizeof(visible_rect) ); - if (!IsRectEmpty( &valid_rects[0] )) - wine_server_add_data( req, valid_rects, 2 * sizeof(*valid_rects) ); + if (valid_rects) wine_server_add_data( req, valid_rects, sizeof(*valid_rects) ); } if (new_surface) req->paint_flags |= SET_WINPOS_PAINT_SURFACE; if (win->pixel_format) req->paint_flags |= SET_WINPOS_PIXEL_FORMAT; @@ -2155,7 +2155,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, register_window_surface( old_surface, new_surface ); if (old_surface) { - if (!IsRectEmpty( valid_rects )) + if (valid_rects) { move_window_bits( hwnd, old_surface, new_surface, &visible_rect, &old_visible_rect, window_rect, valid_rects ); @@ -2165,7 +2165,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, } else if (surface_win && surface_win != hwnd) { - if (!IsRectEmpty( valid_rects )) + if (valid_rects) { RECT rects[2]; int x_offset = old_visible_rect.left - visible_rect.left; diff --git a/server/window.c b/server/window.c index 9492a00..5a415b8 100644 --- a/server/window.c +++ b/server/window.c @@ -1653,7 +1653,7 @@ static struct region *expose_window( struct window *win, const rectangle_t *old_ static void set_window_pos( struct window *win, struct window *previous, unsigned int swp_flags, const rectangle_t *window_rect, const rectangle_t *client_rect, const rectangle_t *visible_rect, - const rectangle_t *valid_rects ) + const rectangle_t *valid_rect ) { struct region *old_vis_rgn = NULL, *exposed_rgn = NULL; const rectangle_t old_window_rect = win->window_rect; @@ -1767,8 +1767,7 @@ static void set_window_pos( struct window *win, struct window *previous, client_rect->right - old_client_rect.right != x_offset || client_rect->top - old_client_rect.top != y_offset || client_rect->bottom - old_client_rect.bottom != y_offset || - !valid_rects || - memcmp( &valid_rects[0], client_rect, sizeof(*client_rect) )); + !valid_rect || memcmp( valid_rect, client_rect, sizeof(*client_rect) )); } if (frame_changed || client_changed) @@ -1776,13 +1775,13 @@ static void set_window_pos( struct window *win, struct window *previous, struct region *win_rgn = old_vis_rgn; /* reuse previous region */ set_region_rect( win_rgn, window_rect ); - if (valid_rects) + if (valid_rect) { /* subtract the valid portion of client rect from the total region */ struct region *tmp = create_empty_region(); if (tmp) { - set_region_rect( tmp, &valid_rects[0] ); + set_region_rect( tmp, valid_rect ); /* subtract update region since invalid parts of the valid rect won't be copied */ if (win->update_region) { @@ -2313,16 +2312,13 @@ DECL_HANDLER(set_window_pos) win->paint_flags = (win->paint_flags & ~PAINT_CLIENT_FLAGS) | (req->paint_flags & PAINT_CLIENT_FLAGS); if (win->paint_flags & PAINT_HAS_PIXEL_FORMAT) update_pixel_format_flags( win ); - if (get_req_data_size() >= 3 * sizeof(rectangle_t)) + if (get_req_data_size() >= 2 * sizeof(rectangle_t)) { - rectangle_t valid_rects[2]; - memcpy( valid_rects, (const rectangle_t *)get_req_data() + 1, 2 * sizeof(rectangle_t) ); + rectangle_t valid_rect; + memcpy( &valid_rect, (const rectangle_t *)get_req_data() + 1, sizeof(rectangle_t) ); if (win->parent && win->parent->ex_style & WS_EX_LAYOUTRTL) - { - mirror_rect( &win->parent->client_rect, &valid_rects[0] ); - mirror_rect( &win->parent->client_rect, &valid_rects[1] ); - } - set_window_pos( win, previous, flags, &window_rect, &client_rect, &visible_rect, valid_rects ); + mirror_rect( &win->parent->client_rect, &valid_rect ); + set_window_pos( win, previous, flags, &window_rect, &client_rect, &visible_rect, &valid_rect ); } else set_window_pos( win, previous, flags, &window_rect, &client_rect, &visible_rect, NULL );

1 0

Alexandre Julliard : server: Don' t convert the surface region to screen coordinates.
by Alexandre Julliard 05 Jun '18

05 Jun '18

Module: wine Branch: master Commit: 55f036e730dd552098a6548d82ceb80e6ee7db4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=55f036e730dd552098a6548d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 5 17:50:28 2018 +0200 server: Don't convert the surface region to screen coordinates. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/window.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/server/window.c b/server/window.c index 5a415b8..7081209 100644 --- a/server/window.c +++ b/server/window.c @@ -2496,13 +2496,10 @@ DECL_HANDLER(get_surface_region) if ((region = get_surface_region( win ))) { - rectangle_t *data; - if (win->parent) map_win_region_to_screen( win->parent, region ); - data = get_region_data_and_free( region, get_reply_max_size(), &reply->total_size ); + rectangle_t *data = get_region_data_and_free( region, get_reply_max_size(), &reply->total_size ); if (data) set_reply_data_ptr( data, reply->total_size ); } reply->visible_rect = win->visible_rect; - if (win->parent) client_to_screen_rect( win->parent, &reply->visible_rect ); }

1 0

Piotr Caban : msvcp120: Fix _Getcvt tests when zh_CN system locale is used.
by Alexandre Julliard 05 Jun '18

05 Jun '18

Module: wine Branch: master Commit: 0963a8693ec883189f2425129382549b26e08806 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0963a8693ec883189f242512… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 5 16:35:00 2018 +0200 msvcp120: Fix _Getcvt tests when zh_CN system locale is used. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index dfd2d06..faf211b 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -190,7 +190,7 @@ static BOOL compare_float(float f, float g, unsigned int ulps) static char* (__cdecl *p_setlocale)(int, const char*); static int (__cdecl *p__setmbcp)(int); -static int (__cdecl *p_isleadbyte)(int); +static int (__cdecl *p__ismbblead)(unsigned int); static MSVCRT_long (__cdecl *p__Xtime_diff_to_millis2)(const xtime*, const xtime*); static int (__cdecl *p_xtime_get)(xtime*, int); @@ -673,7 +673,7 @@ static BOOL init(void) hdll = GetModuleHandleA("msvcr120.dll"); p_setlocale = (void*)GetProcAddress(hdll, "setlocale"); p__setmbcp = (void*)GetProcAddress(hdll, "_setmbcp"); - p_isleadbyte = (void*)GetProcAddress(hdll, "isleadbyte"); + p__ismbblead = (void*)GetProcAddress(hdll, "_ismbblead"); hdll = GetModuleHandleA("kernel32.dll"); pCreateSymbolicLinkA = (void*)GetProcAddress(hdll, "CreateSymbolicLinkA"); @@ -806,8 +806,14 @@ static void test__Getcvt(void) ok(cvtvec.page == 936, "cvtvec.page = %d\n", cvtvec.page); ok(cvtvec.mb_max == 2, "cvtvec.mb_max = %d\n", cvtvec.mb_max); ok(cvtvec.unk == 0, "cvtvec.unk = %d\n", cvtvec.unk); - for(i=0; i<32; i++) - ok(cvtvec.isleadbyte[i] == 0, "cvtvec.isleadbyte[%d] = %x\n", i, cvtvec.isleadbyte[i]); + for(i=0; i<32; i++) { + BYTE b = 0; + int j; + + for(j=0; j<8; j++) + b |= (p__ismbblead(i*8+j) ? 1 : 0) << j; + ok(cvtvec.isleadbyte[i] ==b, "cvtvec.isleadbyte[%d] = %x (%x)\n", i, cvtvec.isleadbyte[i], b); + } p__setmbcp(936); p__Getcvt(&cvtvec); @@ -819,7 +825,7 @@ static void test__Getcvt(void) int j; for(j=0; j<8; j++) - b |= (p_isleadbyte(i*8+j) ? 1 : 0) << j; + b |= (p__ismbblead(i*8+j) ? 1 : 0) << j; ok(cvtvec.isleadbyte[i] ==b, "cvtvec.isleadbyte[%d] = %x (%x)\n", i, cvtvec.isleadbyte[i], b); } }

1 0

Hua Meng : msvcp120: Add tests for concurrent_vector_Internal_push_back and capacity.
by Alexandre Julliard 05 Jun '18

05 Jun '18

Module: wine Branch: master Commit: bfb37b2a4c396e3e9f18f1155495bb1d84327755 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfb37b2a4c396e3e9f18f115… Author: Hua Meng <161220092(a)smail.nju.edu.cn> Date: Tue Jun 5 16:37:29 2018 +0200 msvcp120: Add tests for concurrent_vector_Internal_push_back and capacity. Signed-off-by: Hua Meng <161220092(a)smail.nju.edu.cn> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 155 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 153 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bfb37b2a4c396e3e9f18…

1 0

Michael Stefaniuc : d3dx9/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 05 Jun '18

05 Jun '18

Module: wine Branch: master Commit: 1a5339346f312721acd84269cf122d03ced05c21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a5339346f312721acd84269… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jun 5 00:24:59 2018 +0200 d3dx9/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/core.c | 8 ++++---- dlls/d3dx9_36/tests/effect.c | 2 +- dlls/d3dx9_36/tests/shader.c | 22 +++++++++++----------- dlls/d3dx9_36/tests/surface.c | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 90b678f..75d33c1 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -552,7 +552,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) check_release((IUnknown*)font, 0); } else skip("Failed to create a ID3DXFont object\n"); - for(i = 0; i < sizeof(texture_tests) / sizeof(texture_tests[0]); i++) { + for(i = 0; i < ARRAY_SIZE(texture_tests); i++) { HDC hdc; DWORD ret; HRESULT hr; @@ -617,7 +617,7 @@ static void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device) hr = D3DXCreateRenderToSurface(device, 256, 256, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN, NULL /* out */); ok(hr == D3DERR_INVALIDCALL, "D3DXCreateRenderToSurface returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { hr = D3DXCreateRenderToSurface(device, tests[i].Width, tests[i].Height, tests[i].Format, tests[i].DepthStencil, tests[i].DepthStencilFormat, &render); @@ -1024,7 +1024,7 @@ static void test_ID3DXRenderToSurface(IDirect3DDevice9 *device) check_release((IUnknown *)render, 0); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { check_ID3DXRenderToSurface(device, tests[i].Width, tests[i].Height, tests[i].Format, tests[i].DepthStencil, tests[i].DepthStencilFormat, TRUE); check_ID3DXRenderToSurface(device, tests[i].Width, tests[i].Height, tests[i].Format, tests[i].DepthStencil, tests[i].DepthStencilFormat, FALSE); @@ -1052,7 +1052,7 @@ static void test_D3DXCreateRenderToEnvMap(IDirect3DDevice9 *device) { { 256, 1, D3DFMT_X8R8G8B8, TRUE, D3DFMT_UNKNOWN }, { 256, 1, D3DFMT_X8R8G8B8, TRUE, D3DFMT_UNKNOWN } } }; - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { const D3DXRTE_DESC *parameters = &tests[i].parameters; const D3DXRTE_DESC *expected = &tests[i].expected_values; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 4f26b63..d9ff11e 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -991,7 +991,7 @@ struct test_effect_parameter_value_result test_effect_parameter_value_result_spe test_effect_parameter_value_blob_ ## x,\ sizeof(test_effect_parameter_value_blob_ ## x),\ test_effect_parameter_value_result_ ## x,\ - sizeof(test_effect_parameter_value_result_ ## x)/sizeof(*test_effect_parameter_value_result_ ## x),\ + ARRAY_SIZE(test_effect_parameter_value_result_ ## x),\ } static const struct diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 2f01a46..c2b41cf 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -649,17 +649,17 @@ static void test_constant_table(const char *test_name, const DWORD *ctable_fn, static void test_constant_tables(void) { test_constant_table("test_basic", ctab_basic, ctab_basic_expected, - sizeof(ctab_basic_expected)/sizeof(*ctab_basic_expected)); + ARRAY_SIZE(ctab_basic_expected)); test_constant_table("test_matrices", ctab_matrices, ctab_matrices_expected, - sizeof(ctab_matrices_expected)/sizeof(*ctab_matrices_expected)); + ARRAY_SIZE(ctab_matrices_expected)); test_constant_table("test_matrices2", ctab_matrices2, ctab_matrices2_expected, - sizeof(ctab_matrices2_expected)/sizeof(*ctab_matrices2_expected)); + ARRAY_SIZE(ctab_matrices2_expected)); test_constant_table("test_arrays", ctab_arrays, ctab_arrays_expected, - sizeof(ctab_arrays_expected)/sizeof(*ctab_arrays_expected)); + ARRAY_SIZE(ctab_arrays_expected)); test_constant_table("test_default_values", ctab_with_default_values, ctab_with_default_values_expected, - sizeof(ctab_with_default_values_expected)/sizeof(*ctab_with_default_values_expected)); + ARRAY_SIZE(ctab_with_default_values_expected)); test_constant_table("test_samplers", ctab_samplers, ctab_samplers_expected, - sizeof(ctab_samplers_expected)/sizeof(*ctab_samplers_expected)); + ARRAY_SIZE(ctab_samplers_expected)); } static void test_setting_basic_table(IDirect3DDevice9 *device) @@ -1844,7 +1844,7 @@ static void test_get_shader_constant_variables(void) ctab = ID3DXConstantTable_GetBufferPointer(ctable); ok(ctab[0] == test_get_shader_constant_variables_blob[3], "ID3DXConstantTable_GetBufferPointer failed\n"); - for (i = 0; i < sizeof(test_get_shader_constant_variables_data) / sizeof(*test_get_shader_constant_variables_data); ++i) + for (i = 0; i < ARRAY_SIZE(test_get_shader_constant_variables_data); ++i) { const char *fullname = test_get_shader_constant_variables_data[i].fullname; const D3DXCONSTANT_DESC *expected_desc = &test_get_shader_constant_variables_data[i].desc; @@ -6025,7 +6025,7 @@ static UINT registerset_compare_all(IDirect3DDevice9 *device, BOOL is_vs, D3DXRE D3DXREGISTER_SET regsets[] = {D3DXRS_BOOL, D3DXRS_INT4, D3DXRS_FLOAT4}; UINT err = 0, i; - for (i = 0; i < sizeof(regsets) / sizeof(*regsets); i++) + for (i = 0; i < ARRAY_SIZE(regsets); i++) { if (regset == regsets[i]) err += registerset_compare(device, is_vs, regset, start, in_count, expected); @@ -6137,7 +6137,7 @@ static void test_registerset(void) return; } - for (k = 0; k < sizeof(registerset_data) / sizeof(*registerset_data); ++k) + for (k = 0; k < ARRAY_SIZE(registerset_data); ++k) { const char *tablename = registerset_data[k].name; const char *name = registerset_data[k].var; @@ -6442,7 +6442,7 @@ static void test_registerset_defaults(void) return; } - for (k = 0; k < sizeof(registerset_defaults_data) / sizeof(*registerset_defaults_data); ++k) + for (k = 0; k < ARRAY_SIZE(registerset_defaults_data); ++k) { const char *tablename = registerset_defaults_data[k].name; ID3DXConstantTable *ctable; @@ -6616,7 +6616,7 @@ static void test_shader_semantics(void) hr = D3DXGetShaderInputSemantics(vs_1_1, semantics, NULL); ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { const DWORD *shader = tests[i].shader; diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 324e2af..37c488b 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -398,7 +398,7 @@ static void test_dds_header_handling(void) return; } - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { DWORD file_size = sizeof(dds->magic) + sizeof(dds->header) + tests[i].pixel_data_size; assert(file_size <= sizeof(*dds));

1 0

Michael Stefaniuc : d3dx9/tests: Use ARRAY_SIZE() in the initialization of registerset_data[].
by Alexandre Julliard 05 Jun '18

05 Jun '18

Module: wine Branch: master Commit: 84f587390609889c42c4a445c9cd10a3d8464c57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84f587390609889c42c4a445… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jun 5 00:25:00 2018 +0200 d3dx9/tests: Use ARRAY_SIZE() in the initialization of registerset_data[]. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/shader.c | 383 +++++++++++++++++-------------------------- 1 file changed, 153 insertions(+), 230 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=84f587390609889c42c4…

1 0