wine-devel June 2018

wine-devel@winehq.org

68 participants
583 discussions

[PATCH] comdlg32/tests: Don't undefine ARRAY_SIZE()
by Michael Stefaniuc 27 Jun '18

27 Jun '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comdlg32/tests/filedlg.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index aedb18a192..bf4d1f22eb 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -1116,9 +1116,6 @@ static void test_extension(void) test_extension_helper(&ofn, "TestFilter (*.*.def)\0*.*.def\0", "deadbeef.xyz"); } -#undef ARRAY_SIZE - - static BOOL WINAPI test_null_enum(HWND hwnd, LPARAM lParam) { /* Find the textbox and send a filename so IDOK will work. -- 2.14.4

1 0

[PATCH] msctf: Add TF_CreateCicLoadMutex stub.
by Andrey Gusev 27 Jun '18

27 Jun '18

For https://bugs.winehq.org/show_bug.cgi?id=38270 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/msctf/msctf.c | 9 +++++++++ dlls/msctf/msctf.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index a19eaa1d33..da7375a5c7 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -682,6 +682,15 @@ HRESULT WINAPI TF_InvalidAssemblyListCacheIfExist(void) return S_OK; } +/*********************************************************************** + * TF_CreateCicLoadMutex (MSCTF.@) + */ +HRESULT WINAPI TF_CreateCicLoadMutex(void) +{ + FIXME("stub!\n"); + return E_FAIL; +} + /*********************************************************************** * TF_CreateLangBarMgr (MSCTF.@) */ diff --git a/dlls/msctf/msctf.spec b/dlls/msctf/msctf.spec index c3d909ccf5..2a2430cb3e 100644 --- a/dlls/msctf/msctf.spec +++ b/dlls/msctf/msctf.spec @@ -9,7 +9,7 @@ @ stub TF_CheckThreadInputIdle @ stub TF_ClearLangBarAddIns @ stub TF_CreateCategoryMgr -@ stub TF_CreateCicLoadMutex +@ stdcall TF_CreateCicLoadMutex() @ stub TF_CreateDisplayAttributeMgr @ stdcall TF_CreateInputProcessorProfiles(ptr) @ stdcall TF_CreateLangBarItemMgr(ptr) -- 2.17.1

2 1

[PATCH v2] msvcp120: Add test for Concurrent_vector_Internal_resize and reverse.
by Piotr Caban 27 Jun '18

27 Jun '18

From: Hua Meng <161220092(a)smail.nju.edu.cn> Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - added test for vector capacity after _Internal_reserve call dlls/msvcp120/tests/msvcp120.c | 90 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+)

1 0

[PATCH 5/5] schedsvc: Use current time as trigger begin time when necessary.
by Dmitry Timoshkov 27 Jun '18

27 Jun '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index b463be6960..a0e0727b31 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -170,6 +170,9 @@ static BOOL trigger_get_next_runtime(const TASK_TRIGGER *trigger, const FILETIME FileTimeToSystemTime(current_ft, &current_st); get_begin_time(trigger, &begin_ft); + if (CompareFileTime(&begin_ft, current_ft) < 0) + begin_ft = *current_ft; + get_end_time(trigger, &end_ft); switch (trigger->TriggerType) -- 2.16.3

1 0

[PATCH 4/5] schedsvc: Avoid an infinite loop.
by Dmitry Timoshkov 27 Jun '18

27 Jun '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index df4185eac2..b463be6960 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -194,6 +194,9 @@ static BOOL trigger_get_next_runtime(const TASK_TRIGGER *trigger, const FILETIME break; case TASK_TIME_TRIGGER_DAILY: + if (!trigger->Type.Daily.DaysInterval) + break; /* avoid infinite loop */ + st = current_st; st.wHour = trigger->wStartHour; st.wMinute = trigger->wStartMinute; -- 2.16.3

1 0

[PATCH 3/5] schedsvc: Minor cleanup.
by Dmitry Timoshkov 27 Jun '18

27 Jun '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index b8adc7279d..df4185eac2 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -99,7 +99,7 @@ static void filetime_add_ms(FILETIME *ft, LONGLONG ms) LONGLONG ll; } *ftll = (union u_ftll *)ft; - ftll->ll += ms * (ULONGLONG)10000; + ftll->ll += ms * (LONGLONG)10000; } static void filetime_add_minutes(FILETIME *ft, LONG minutes) @@ -117,7 +117,7 @@ static void filetime_add_days(FILETIME *ft, LONG days) filetime_add_hours(ft, (LONGLONG)days * 24); } -static void filetime_add_weeks(FILETIME *ft, ULONG weeks) +static void filetime_add_weeks(FILETIME *ft, LONG weeks) { filetime_add_days(ft, (LONGLONG)weeks * 7); } @@ -250,7 +250,7 @@ static BOOL trigger_get_next_runtime(const TASK_TRIGGER *trigger, const FILETIME return FALSE; } -static BOOL job_get_next_runtime(struct job_t *job, FILETIME *current_ft, FILETIME *next_rt) +static BOOL job_get_next_runtime(struct job_t *job, const FILETIME *current_ft, FILETIME *next_rt) { FILETIME trigger_rt; BOOL have_next_rt = FALSE; @@ -307,7 +307,7 @@ BOOL get_next_runtime(LARGE_INTEGER *rt) return have_next_rt; } -static BOOL job_runs_at(struct job_t *job, FILETIME *begin_ft, FILETIME *end_ft) +static BOOL job_runs_at(struct job_t *job, const FILETIME *begin_ft, const FILETIME *end_ft) { FILETIME job_ft; -- 2.16.3

1 0

[PATCH 2/5] mstask: Avoid an infinite loop.
by Dmitry Timoshkov 27 Jun '18

27 Jun '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 6492f16986..6c27b76c95 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -532,6 +532,9 @@ static HRESULT WINAPI MSTASK_ITask_GetNextRunTime(ITask *iface, SYSTEMTIME *rt) break; case TASK_TIME_TRIGGER_DAILY: + if (!This->trigger[i].Type.Daily.DaysInterval) + break; /* avoid infinite loop */ + st = current_st; st.wHour = This->trigger[i].wStartHour; st.wMinute = This->trigger[i].wStartMinute; -- 2.16.3

1 0

[PATCH 1/5] mstask: Use current time as trigger begin time when necessary.
by Dmitry Timoshkov 27 Jun '18

27 Jun '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 490229ae71..6492f16986 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -481,7 +481,7 @@ static HRESULT WINAPI MSTASK_ITask_GetNextRunTime(ITask *iface, SYSTEMTIME *rt) TaskImpl *This = impl_from_ITask(iface); HRESULT hr = SCHED_S_TASK_NO_VALID_TRIGGERS; SYSTEMTIME st, current_st; - FILETIME current_ft, begin_ft, end_ft, best_ft; + FILETIME current_ft, trigger_ft, begin_ft, end_ft, best_ft; BOOL have_best_time = FALSE; DWORD i; @@ -494,12 +494,16 @@ static HRESULT WINAPI MSTASK_ITask_GetNextRunTime(ITask *iface, SYSTEMTIME *rt) } GetLocalTime(&current_st); + SystemTimeToFileTime(&current_st, &current_ft); for (i = 0; i < This->trigger_count; i++) { if (!(This->trigger[i].rgFlags & TASK_TRIGGER_FLAG_DISABLED)) { get_begin_time(&This->trigger[i], &begin_ft); + if (CompareFileTime(&begin_ft, &current_ft) < 0) + begin_ft = current_ft; + get_end_time(&This->trigger[i], &end_ft); switch (This->trigger[i].TriggerType) @@ -516,12 +520,12 @@ static HRESULT WINAPI MSTASK_ITask_GetNextRunTime(ITask *iface, SYSTEMTIME *rt) st.wMinute = This->trigger[i].wStartMinute; st.wSecond = 0; st.wMilliseconds = 0; - SystemTimeToFileTime(&st, &current_ft); - if (CompareFileTime(&begin_ft, &current_ft) <= 0 && CompareFileTime(&current_ft, &end_ft) < 0) + SystemTimeToFileTime(&st, &trigger_ft); + if (CompareFileTime(&begin_ft, &trigger_ft) <= 0 && CompareFileTime(&trigger_ft, &end_ft) < 0) { - if (!have_best_time || CompareFileTime(&current_ft, &best_ft) < 0) + if (!have_best_time || CompareFileTime(&trigger_ft, &best_ft) < 0) { - best_ft = current_ft; + best_ft = trigger_ft; have_best_time = TRUE; } } @@ -533,20 +537,20 @@ static HRESULT WINAPI MSTASK_ITask_GetNextRunTime(ITask *iface, SYSTEMTIME *rt) st.wMinute = This->trigger[i].wStartMinute; st.wSecond = 0; st.wMilliseconds = 0; - SystemTimeToFileTime(&st, &current_ft); - while (CompareFileTime(&current_ft, &end_ft) < 0) + SystemTimeToFileTime(&st, &trigger_ft); + while (CompareFileTime(&trigger_ft, &end_ft) < 0) { - if (CompareFileTime(&current_ft, &begin_ft) >= 0) + if (CompareFileTime(&trigger_ft, &begin_ft) >= 0) { - if (!have_best_time || CompareFileTime(&current_ft, &best_ft) < 0) + if (!have_best_time || CompareFileTime(&trigger_ft, &best_ft) < 0) { - best_ft = current_ft; + best_ft = trigger_ft; have_best_time = TRUE; } break; } - filetime_add_days(&current_ft, This->trigger[i].Type.Daily.DaysInterval); + filetime_add_days(&trigger_ft, This->trigger[i].Type.Daily.DaysInterval); } break; @@ -559,18 +563,18 @@ static HRESULT WINAPI MSTASK_ITask_GetNextRunTime(ITask *iface, SYSTEMTIME *rt) st.wMinute = This->trigger[i].wStartMinute; st.wSecond = 0; st.wMilliseconds = 0; - SystemTimeToFileTime(&st, &current_ft); - while (CompareFileTime(&current_ft, &end_ft) < 0) + SystemTimeToFileTime(&st, &trigger_ft); + while (CompareFileTime(&trigger_ft, &end_ft) < 0) { - FileTimeToSystemTime(&current_ft, &st); + FileTimeToSystemTime(&trigger_ft, &st); - if (CompareFileTime(&current_ft, &begin_ft) >= 0) + if (CompareFileTime(&trigger_ft, &begin_ft) >= 0) { if (This->trigger[i].Type.Weekly.rgfDaysOfTheWeek & (1 << st.wDayOfWeek)) { - if (!have_best_time || CompareFileTime(&current_ft, &best_ft) < 0) + if (!have_best_time || CompareFileTime(&trigger_ft, &best_ft) < 0) { - best_ft = current_ft; + best_ft = trigger_ft; have_best_time = TRUE; } break; @@ -578,9 +582,9 @@ static HRESULT WINAPI MSTASK_ITask_GetNextRunTime(ITask *iface, SYSTEMTIME *rt) } if (st.wDayOfWeek == 0 && This->trigger[i].Type.Weekly.WeeksInterval > 1) /* Sunday, goto next week */ - filetime_add_weeks(&current_ft, This->trigger[i].Type.Weekly.WeeksInterval - 1); + filetime_add_weeks(&trigger_ft, This->trigger[i].Type.Weekly.WeeksInterval - 1); else /* check next weekday */ - filetime_add_days(&current_ft, 1); + filetime_add_days(&trigger_ft, 1); } break; -- 2.16.3

1 0

[PATCH] testbot/web: Let GetHtmlLine() detect and format the timeout errors.
by Francois Gouget 27 Jun '18

27 Jun '18

It already handles filtering and highlighting errors so it makes sense to also have if reformat the timeout errors for the log summary. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index e5f792929..e7e53d208 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -253,6 +253,11 @@ sub GetHtmlLine($$$) return undef if ($Category ne "error" and !$FullLog); my $Html = $self->escapeHTML($Line); + if (!$FullLog and $Html =~ m/^[^:]+:([^:]*)(?::[0-9a-f]+)? done $258$/) + { + my $Unit = $1; + return $Unit ne "" ? "$Unit: Timeout" : "Timeout"; + } if ($FullLog and $Category ne "none") { # Highlight all line categories in the full log @@ -414,15 +419,7 @@ sub GenerateBody($) print "<pre><code>"; $LogFirst = 0; } - if (!$MoreInfo->{Full} && $Line =~ m/^[^:]+:([^:]*)(?::[0-9a-f]+)? done $258$/) - { - my $Unit = $1 ne "" ? "$1: " : ""; - print "${Unit}Timeout\n"; - } - else - { - print "$Html\n"; - } + print "$Html\n"; } close($LogFile); -- 2.18.0

1 0

[PATCH] testbot: Track patches to the Wine modules separately.
by Francois Gouget 27 Jun '18

27 Jun '18

Patches to the dlls and programs modules don't require a rebuild of the native Wine tools. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 13 +++++++++++++ testbot/lib/WineTestBot/Patches.pm | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index b2bfe6a9a..811c3b8b2 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -193,6 +193,19 @@ sub _HandleFile($$$) } $Tests->{$Module}->{Files}->{$File} = $Change; } + elsif ($FilePath =~ m~^(dlls|programs)/([^/]+)/([^/\s]+)$~) + { + my ($Root, $Dir, $File) = ($1, $2, $3); + my $Module = ($Root eq "programs") ? "$Dir.exe" : $Dir; + $Impacts->{IsWinePatch} = 1; + $Impacts->{ModuleBuild} = 1; + + if ($File eq "Makefile.in" and $Change ne "modify") + { + # This adds / removes a directory + $Impacts->{MakeMakefiles} = 1; + } + } else { my $WineFiles = $Impacts->{WineFiles} || $_WineFiles; diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index fe333d943..50f720861 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -136,7 +136,8 @@ sub Submit($$$) $PastImpacts = GetPatchImpact($PatchFileName) if ($IsSet); my $Impacts = GetPatchImpact("$DataDir/patches/" . $self->Id, undef, $PastImpacts); - if (!$Impacts->{WineBuild} and !$Impacts->{TestBuild}) + if (!$Impacts->{WineBuild} and !$Impacts->{ModuleBuild} and + !$Impacts->{TestBuild}) { if ($Impacts->{IsWinePatch}) { -- 2.18.0

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel June 2018