- wine-devel - winehq.org

[PATCH 5/7] jscript: Use jsdisp_define_property to set prototype constructors.
by Jacek Caban 14 May '18

14 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 5 ----- dlls/jscript/function.c | 3 ++- dlls/jscript/jscript.h | 1 - dlls/mshtml/tests/es5.js | 1 + 4 files changed, 3 insertions(+), 7 deletions(-)

1 0

[PATCH 4/7] jscript: Use jsdisp_define_property to set function prototypes.
by Jacek Caban 14 May '18

14 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/function.c | 12 ++++-------- dlls/mshtml/tests/es5.js | 4 ++++ 2 files changed, 8 insertions(+), 8 deletions(-)

1 0

[PATCH 3/7] jscript: Use jsdisp_define_data_property for arguments object properties.
by Jacek Caban 14 May '18

14 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/function.c | 6 ++++-- dlls/mshtml/tests/es5.js | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-)

1 0

[PATCH 2/7] jscript: Use jsdisp_define_property for Error object properties.
by Jacek Caban 14 May '18

14 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/error.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)

1 0

[PATCH 1/7] jscript: Get rid of no longer used jsdisp_propput_const.
by Jacek Caban 14 May '18

14 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 12 ------------ 1 file changed, 12 deletions(-)

1 0

[PATCH] wined3d: Implement WINED3DFMT_B8G8R8X8_UNORM to WINED3DFMT_L8_UNORM conversion
by Stanislav Zhukov 14 May '18

14 May '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=44888 Signed-off-by: Stanislav Zhukov <koncord(a)tes3mp.com> --- dlls/wined3d/surface.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5217033..351d888 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -801,6 +801,25 @@ static void convert_yuy2_r5g6b5(const BYTE *src, BYTE *dst, } } +static void convert_x8r8g8b8_l8(const BYTE *src, BYTE *dst, + DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) +{ + unsigned int x, y; + + TRACE("Converting %ux%u pixels, pitches %u %u.\n", w, h, pitch_in, pitch_out); + + for (y = 0; y < h; ++y) + { + const DWORD *src_line = (const DWORD *)(src + y * pitch_in); + BYTE *dst_line = (BYTE *)(dst + y * pitch_out); + + for (x = 0; x < w; ++x) + { + dst_line[x] = src_line[x] & 0x000000ff; + } + } +} + struct d3dfmt_converter_desc { enum wined3d_format_id from, to; @@ -815,6 +834,7 @@ static const struct d3dfmt_converter_desc converters[] = {WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_B8G8R8A8_UNORM, convert_a8r8g8b8_x8r8g8b8}, {WINED3DFMT_YUY2, WINED3DFMT_B8G8R8X8_UNORM, convert_yuy2_x8r8g8b8}, {WINED3DFMT_YUY2, WINED3DFMT_B5G6R5_UNORM, convert_yuy2_r5g6b5}, + {WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_L8_UNORM, convert_x8r8g8b8_l8}, }; static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_format_id from, -- 2.7.4

2 1

[PATCH] testbot: Tweak the 'Putting VM offline' email.
by Francois Gouget 14 May '18

14 May '18

Emphasize that the TestBot is still monitoring the VM. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 5d60dde1b..f9a43bb77 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -208,7 +208,7 @@ sub FatalError($) NotifyAdministrator("Putting the $VMKey VM offline", "Could not perform the $Action operation on the $VMKey VM:\n". "\n$ErrMessage\n". - "The VM has been put offline."); + "The VM has been put offline and the TestBot will try to regain access to it."); } exit 1; } -- 2.17.0

1 0

[PATCH] testbot: Requeue the task in case the script gets stuck.
by Francois Gouget 14 May '18

14 May '18

Count how many times the task has been requeued to avoid infinite loops, just like the scripts themselves normally do. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Tasks.pm | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 72dd3ff23..36cbfadbe 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -165,11 +165,25 @@ sub UpdateStatus($$) close TASKLOG; } umask($OldUMask); - # This probably indicates a bug in the task script. - # Don't requeue the task to avoid an infinite loop. + require WineTestBot::Log; WineTestBot::Log::LogMsg("Child process for task $JobId/$StepNo/$TaskNo died unexpectedly\n"); - $self->Status("boterror"); + + # A crash probably indicates a bug in the task script but getting stuck + # could happen due to network issues. So requeue the task like its script + # would and count attempts to avoid getting into an infinite loop. + if ($self->CanRetry()) + { + $Status = "queued"; + $self->TestFailures(($self->TestFailures || 0) + 1); + $self->Started(undef); + $self->Ended(undef); + } + else + { + $Status = "boterror"; + } + $self->Status($Status); $self->Save(); if ($VM->Status eq "running") @@ -181,8 +195,6 @@ sub UpdateStatus($$) $VM->RecordResult(undef, "boterror process died"); } # else it looks like this is not our VM anymore - - $Status = "boterror"; } elsif ($Skip && $Status eq "queued") { -- 2.17.0

1 0

[PATCH] shell32: Check array index limit first.
by Andrey Gusev 14 May '18

14 May '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/shell32/shelllink.c | 2 +- dlls/shell32/xdg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 07c83d151c..0380ac9e7a 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -613,7 +613,7 @@ static LPWSTR Stream_LoadPath( LPCSTR p, DWORD maxlen ) int len = 0, wlen; LPWSTR path; - while( p[len] && (len < maxlen) ) + while( (len < maxlen) && p[len] ) len++; wlen = MultiByteToWideChar(CP_ACP, 0, p, len, NULL, 0); diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index 622ef34623..781902a238 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -341,7 +341,7 @@ static int dskentry_decode(const char *value, int len, char *output) while (pos<len) { char c; - if (value[pos] == '\\' && pos<len-1) + if (pos<len-1 && value[pos] == '\\') { pos++; switch (value[pos]) -- 2.14.3

1 0

[PATCH 7/7] mstask: Move trigger management to the ITask implementation.
by Dmitry Timoshkov 14 May '18

14 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/mstask_private.h | 4 +- dlls/mstask/task.c | 193 ++++++++++++++++++++++++++++++++++--- dlls/mstask/task_trigger.c | 203 ++++----------------------------------- dlls/mstask/tests/task_trigger.c | 11 --- 4 files changed, 203 insertions(+), 208 deletions(-) diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h index 038c6c84c1..dbaf5433b0 100644 --- a/dlls/mstask/mstask_private.h +++ b/dlls/mstask/mstask_private.h @@ -27,9 +27,11 @@ extern LONG dll_ref DECLSPEC_HIDDEN; typedef struct ClassFactoryImpl ClassFactoryImpl; extern ClassFactoryImpl MSTASK_ClassFactory DECLSPEC_HIDDEN; -extern HRESULT TaskTriggerConstructor(LPVOID *ppObj) DECLSPEC_HIDDEN; +extern HRESULT TaskTriggerConstructor(ITask *task, WORD idx, ITaskTrigger **trigger) DECLSPEC_HIDDEN; extern HRESULT TaskSchedulerConstructor(LPVOID *ppObj) DECLSPEC_HIDDEN; extern HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **task) DECLSPEC_HIDDEN; +extern HRESULT task_set_trigger(ITask *task, WORD idx, const TASK_TRIGGER *trigger) DECLSPEC_HIDDEN; +extern HRESULT task_get_trigger(ITask *task, WORD idx, TASK_TRIGGER *trigger) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW(const WCHAR *src) { diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 68452afa4f..5129d9a513 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "objbase.h" #include "taskschd.h" #include "mstask.h" @@ -144,15 +145,176 @@ static ULONG WINAPI MSTASK_ITask_Release( return ref; } +HRESULT task_set_trigger(ITask *task, WORD idx, const TASK_TRIGGER *src) +{ + TaskImpl *This = impl_from_ITask(task); + TIME_FIELDS field_time; + LARGE_INTEGER sys_time; + TASK_TRIGGER dst; + + TRACE("(%p, %u, %p)\n", task, idx, src); + + if (idx >= This->trigger_count) + return E_FAIL; + + /* Verify valid structure size */ + if (src->cbTriggerSize != sizeof(*src)) + return E_INVALIDARG; + dst.cbTriggerSize = src->cbTriggerSize; + + /* Reserved field must be zero */ + dst.Reserved1 = 0; + + /* Verify and set valid start date and time */ + memset(&field_time, 0, sizeof(field_time)); + field_time.Year = src->wBeginYear; + field_time.Month = src->wBeginMonth; + field_time.Day = src->wBeginDay; + field_time.Hour = src->wStartHour; + field_time.Minute = src->wStartMinute; + if (!RtlTimeFieldsToTime(&field_time, &sys_time)) + return E_INVALIDARG; + dst.wBeginYear = src->wBeginYear; + dst.wBeginMonth = src->wBeginMonth; + dst.wBeginDay = src->wBeginDay; + dst.wStartHour = src->wStartHour; + dst.wStartMinute = src->wStartMinute; + + /* Verify valid end date if TASK_TRIGGER_FLAG_HAS_END_DATE flag is set */ + if (src->rgFlags & TASK_TRIGGER_FLAG_HAS_END_DATE) + { + memset(&field_time, 0, sizeof(field_time)); + field_time.Year = src->wEndYear; + field_time.Month = src->wEndMonth; + field_time.Day = src->wEndDay; + if (!RtlTimeFieldsToTime(&field_time, &sys_time)) + return E_INVALIDARG; + } + + /* Set valid end date independent of TASK_TRIGGER_FLAG_HAS_END_DATE flag */ + dst.wEndYear = src->wEndYear; + dst.wEndMonth = src->wEndMonth; + dst.wEndDay = src->wEndDay; + + /* Verify duration and interval pair */ + if (src->MinutesDuration <= src->MinutesInterval && src->MinutesInterval > 0) + return E_INVALIDARG; + dst.MinutesDuration = src->MinutesDuration; + dst.MinutesInterval = src->MinutesInterval; + + /* Copy over flags */ + dst.rgFlags = src->rgFlags; + + /* Set TriggerType dependent fields of Type union */ + dst.TriggerType = src->TriggerType; + switch (src->TriggerType) + { + case TASK_TIME_TRIGGER_DAILY: + dst.Type.Daily.DaysInterval = src->Type.Daily.DaysInterval; + break; + case TASK_TIME_TRIGGER_WEEKLY: + dst.Type.Weekly.WeeksInterval = src->Type.Weekly.WeeksInterval; + dst.Type.Weekly.rgfDaysOfTheWeek = src->Type.Weekly.rgfDaysOfTheWeek; + break; + case TASK_TIME_TRIGGER_MONTHLYDATE: + dst.Type.MonthlyDate.rgfDays = src->Type.MonthlyDate.rgfDays; + dst.Type.MonthlyDate.rgfMonths = src->Type.MonthlyDate.rgfMonths; + break; + case TASK_TIME_TRIGGER_MONTHLYDOW: + dst.Type.MonthlyDOW.wWhichWeek = src->Type.MonthlyDOW.wWhichWeek; + dst.Type.MonthlyDOW.rgfDaysOfTheWeek = src->Type.MonthlyDOW.rgfDaysOfTheWeek; + dst.Type.MonthlyDOW.rgfMonths = src->Type.MonthlyDOW.rgfMonths; + break; + case TASK_TIME_TRIGGER_ONCE: + case TASK_EVENT_TRIGGER_ON_IDLE: + case TASK_EVENT_TRIGGER_AT_SYSTEMSTART: + case TASK_EVENT_TRIGGER_AT_LOGON: + default: + dst.Type = src->Type; + break; + } + + /* Reserved field must be zero */ + dst.Reserved2 = 0; + + /* wRandomMinutesInterval not currently used and is initialized to zero */ + dst.wRandomMinutesInterval = 0; + + This->trigger[idx] = dst; + + return S_OK; +} + +HRESULT task_get_trigger(ITask *task, WORD idx, TASK_TRIGGER *dst) +{ + TaskImpl *This = impl_from_ITask(task); + TASK_TRIGGER *src; + + TRACE("(%p, %u, %p)\n", task, idx, dst); + + if (idx >= This->trigger_count) + return SCHED_E_TRIGGER_NOT_FOUND; + + src = &This->trigger[idx]; + + /* Native implementation doesn't verify equivalent cbTriggerSize fields */ + + /* Copy relevant fields of the structure */ + dst->cbTriggerSize = src->cbTriggerSize; + dst->Reserved1 = 0; + dst->wBeginYear = src->wBeginYear; + dst->wBeginMonth = src->wBeginMonth; + dst->wBeginDay = src->wBeginDay; + dst->wEndYear = src->wEndYear; + dst->wEndMonth = src->wEndMonth; + dst->wEndDay = src->wEndDay; + dst->wStartHour = src->wStartHour; + dst->wStartMinute = src->wStartMinute; + dst->MinutesDuration = src->MinutesDuration; + dst->MinutesInterval = src->MinutesInterval; + dst->rgFlags = src->rgFlags; + dst->TriggerType = src->TriggerType; + switch (src->TriggerType) + { + case TASK_TIME_TRIGGER_DAILY: + dst->Type.Daily.DaysInterval = src->Type.Daily.DaysInterval; + break; + case TASK_TIME_TRIGGER_WEEKLY: + dst->Type.Weekly.WeeksInterval = src->Type.Weekly.WeeksInterval; + dst->Type.Weekly.rgfDaysOfTheWeek = src->Type.Weekly.rgfDaysOfTheWeek; + break; + case TASK_TIME_TRIGGER_MONTHLYDATE: + dst->Type.MonthlyDate.rgfDays = src->Type.MonthlyDate.rgfDays; + dst->Type.MonthlyDate.rgfMonths = src->Type.MonthlyDate.rgfMonths; + break; + case TASK_TIME_TRIGGER_MONTHLYDOW: + dst->Type.MonthlyDOW.wWhichWeek = src->Type.MonthlyDOW.wWhichWeek; + dst->Type.MonthlyDOW.rgfDaysOfTheWeek = src->Type.MonthlyDOW.rgfDaysOfTheWeek; + dst->Type.MonthlyDOW.rgfMonths = src->Type.MonthlyDOW.rgfMonths; + break; + case TASK_TIME_TRIGGER_ONCE: + case TASK_EVENT_TRIGGER_ON_IDLE: + case TASK_EVENT_TRIGGER_AT_SYSTEMSTART: + case TASK_EVENT_TRIGGER_AT_LOGON: + default: + break; + } + dst->Reserved2 = 0; + dst->wRandomMinutesInterval = 0; + + return S_OK; +} + static HRESULT WINAPI MSTASK_ITask_CreateTrigger(ITask *iface, WORD *idx, ITaskTrigger **task_trigger) { TaskImpl *This = impl_from_ITask(iface); TASK_TRIGGER *new_trigger; + SYSTEMTIME time; HRESULT hr; TRACE("(%p, %p, %p)\n", iface, idx, task_trigger); - hr = TaskTriggerConstructor((void **)task_trigger); + hr = TaskTriggerConstructor(iface, This->trigger_count, task_trigger); if (hr != S_OK) return hr; if (This->trigger) @@ -167,9 +329,22 @@ static HRESULT WINAPI MSTASK_ITask_CreateTrigger(ITask *iface, WORD *idx, ITaskT This->trigger = new_trigger; - hr = ITaskTrigger_GetTrigger(*task_trigger, &This->trigger[This->trigger_count]); - if (hr == S_OK) - *idx = This->trigger_count++; + new_trigger = &This->trigger[This->trigger_count]; + + /* Most fields default to zero. Initialize other fields to default values. */ + memset(new_trigger, 0, sizeof(*new_trigger)); + GetLocalTime(&time); + new_trigger->cbTriggerSize = sizeof(*new_trigger); + new_trigger->wBeginYear = time.wYear; + new_trigger->wBeginMonth = time.wMonth; + new_trigger->wBeginDay = time.wDay; + new_trigger->wStartHour = time.wHour; + new_trigger->wStartMinute = time.wMinute; + new_trigger->rgFlags = TASK_TRIGGER_FLAG_DISABLED; + new_trigger->TriggerType = TASK_TIME_TRIGGER_DAILY, + new_trigger->Type.Daily.DaysInterval = 1; + + *idx = This->trigger_count++; return hr; } @@ -204,21 +379,13 @@ static HRESULT WINAPI MSTASK_ITask_GetTriggerCount(ITask *iface, WORD *count) static HRESULT WINAPI MSTASK_ITask_GetTrigger(ITask *iface, WORD idx, ITaskTrigger **trigger) { TaskImpl *This = impl_from_ITask(iface); - HRESULT hr; TRACE("(%p, %u, %p)\n", iface, idx, trigger); if (idx >= This->trigger_count) return SCHED_E_TRIGGER_NOT_FOUND; - hr = TaskTriggerConstructor((void **)trigger); - if (hr != S_OK) return hr; - - hr = ITaskTrigger_SetTrigger(*trigger, &This->trigger[idx]); - if (hr != S_OK) - ITaskTrigger_Release(*trigger); - - return hr; + return TaskTriggerConstructor(iface, idx, trigger); } static HRESULT WINAPI MSTASK_ITask_GetTriggerString( diff --git a/dlls/mstask/task_trigger.c b/dlls/mstask/task_trigger.c index 0f24e1f998..e3f190a315 100644 --- a/dlls/mstask/task_trigger.c +++ b/dlls/mstask/task_trigger.c @@ -23,7 +23,6 @@ #include "windef.h" #include "winbase.h" #include "objbase.h" -#include "winternl.h" #include "taskschd.h" #include "mstask.h" #include "mstask_private.h" @@ -35,7 +34,8 @@ typedef struct { ITaskTrigger ITaskTrigger_iface; LONG ref; - TASK_TRIGGER triggerCond; + ITask *parent_task; + WORD trigger_index; } TaskTriggerImpl; static inline TaskTriggerImpl *impl_from_ITaskTrigger(ITaskTrigger *iface) @@ -86,186 +86,33 @@ static ULONG WINAPI MSTASK_ITaskTrigger_Release( ref = InterlockedDecrement(&This->ref); if (ref == 0) { + ITask_Release(This->parent_task); heap_free(This); InterlockedDecrement(&dll_ref); } return ref; } -static HRESULT WINAPI MSTASK_ITaskTrigger_SetTrigger( - ITaskTrigger* iface, - const PTASK_TRIGGER pTrigger) +static HRESULT WINAPI MSTASK_ITaskTrigger_SetTrigger(ITaskTrigger *iface, const PTASK_TRIGGER trigger) { - TaskTriggerImpl * This = impl_from_ITaskTrigger(iface); - TIME_FIELDS field_time; - LARGE_INTEGER sys_time; - TASK_TRIGGER tmp_trigger_cond; - - TRACE("(%p, %p)\n", iface, pTrigger); - - if (!pTrigger) return E_INVALIDARG; - - /* Verify valid structure size */ - if (pTrigger->cbTriggerSize != sizeof(*pTrigger)) - return E_INVALIDARG; - tmp_trigger_cond.cbTriggerSize = pTrigger->cbTriggerSize; - - /* Reserved field must be zero */ - tmp_trigger_cond.Reserved1 = 0; - - /* Verify and set valid start date and time */ - memset(&field_time, 0, sizeof(field_time)); - field_time.Year = pTrigger->wBeginYear; - field_time.Month = pTrigger->wBeginMonth; - field_time.Day = pTrigger->wBeginDay; - field_time.Hour = pTrigger->wStartHour; - field_time.Minute = pTrigger->wStartMinute; - if (!RtlTimeFieldsToTime(&field_time, &sys_time)) - return E_INVALIDARG; - tmp_trigger_cond.wBeginYear = pTrigger->wBeginYear; - tmp_trigger_cond.wBeginMonth = pTrigger->wBeginMonth; - tmp_trigger_cond.wBeginDay = pTrigger->wBeginDay; - tmp_trigger_cond.wStartHour = pTrigger->wStartHour; - tmp_trigger_cond.wStartMinute = pTrigger->wStartMinute; - - /* Verify valid end date if TASK_TRIGGER_FLAG_HAS_END_DATE flag is set */ - if (pTrigger->rgFlags & TASK_TRIGGER_FLAG_HAS_END_DATE) - { - memset(&field_time, 0, sizeof(field_time)); - field_time.Year = pTrigger->wEndYear; - field_time.Month = pTrigger->wEndMonth; - field_time.Day = pTrigger->wEndDay; - if (!RtlTimeFieldsToTime(&field_time, &sys_time)) - return E_INVALIDARG; - } - - /* Set valid end date independent of TASK_TRIGGER_FLAG_HAS_END_DATE flag */ - tmp_trigger_cond.wEndYear = pTrigger->wEndYear; - tmp_trigger_cond.wEndMonth = pTrigger->wEndMonth; - tmp_trigger_cond.wEndDay = pTrigger->wEndDay; - - /* Verify duration and interval pair */ - if (pTrigger->MinutesDuration <= pTrigger->MinutesInterval && - pTrigger->MinutesInterval > 0) - return E_INVALIDARG; - tmp_trigger_cond.MinutesDuration = pTrigger->MinutesDuration; - tmp_trigger_cond.MinutesInterval = pTrigger->MinutesInterval; - - /* Copy over flags */ - tmp_trigger_cond.rgFlags = pTrigger->rgFlags; - - /* Set TriggerType dependent fields of Type union */ - tmp_trigger_cond.TriggerType = pTrigger->TriggerType; - switch (pTrigger->TriggerType) - { - case TASK_TIME_TRIGGER_DAILY: - tmp_trigger_cond.Type.Daily.DaysInterval = - pTrigger->Type.Daily.DaysInterval; - break; - case TASK_TIME_TRIGGER_WEEKLY: - tmp_trigger_cond.Type.Weekly.WeeksInterval = - pTrigger->Type.Weekly.WeeksInterval; - tmp_trigger_cond.Type.Weekly.rgfDaysOfTheWeek = - pTrigger->Type.Weekly.rgfDaysOfTheWeek; - break; - case TASK_TIME_TRIGGER_MONTHLYDATE: - tmp_trigger_cond.Type.MonthlyDate.rgfDays = - pTrigger->Type.MonthlyDate.rgfDays; - tmp_trigger_cond.Type.MonthlyDate.rgfMonths = - pTrigger->Type.MonthlyDate.rgfMonths; - break; - case TASK_TIME_TRIGGER_MONTHLYDOW: - tmp_trigger_cond.Type.MonthlyDOW.wWhichWeek = - pTrigger->Type.MonthlyDOW.wWhichWeek; - tmp_trigger_cond.Type.MonthlyDOW.rgfDaysOfTheWeek = - pTrigger->Type.MonthlyDOW.rgfDaysOfTheWeek; - tmp_trigger_cond.Type.MonthlyDOW.rgfMonths = - pTrigger->Type.MonthlyDOW.rgfMonths; - break; - case TASK_TIME_TRIGGER_ONCE: - case TASK_EVENT_TRIGGER_ON_IDLE: - case TASK_EVENT_TRIGGER_AT_SYSTEMSTART: - case TASK_EVENT_TRIGGER_AT_LOGON: - default: - tmp_trigger_cond.Type = This->triggerCond.Type; - break; - } - - /* Reserved field must be zero */ - tmp_trigger_cond.Reserved2 = 0; + TaskTriggerImpl *This = impl_from_ITaskTrigger(iface); - /* wRandomMinutesInterval not currently used and is initialized to zero */ - tmp_trigger_cond.wRandomMinutesInterval = 0; + TRACE("(%p, %p)\n", iface, trigger); - /* Update object copy of triggerCond */ - This->triggerCond = tmp_trigger_cond; + if (!trigger) return E_INVALIDARG; - return S_OK; + return task_set_trigger(This->parent_task, This->trigger_index, trigger); } -static HRESULT WINAPI MSTASK_ITaskTrigger_GetTrigger( - ITaskTrigger* iface, - PTASK_TRIGGER pTrigger) +static HRESULT WINAPI MSTASK_ITaskTrigger_GetTrigger(ITaskTrigger *iface, TASK_TRIGGER *trigger) { - TaskTriggerImpl * This = impl_from_ITaskTrigger(iface); - - TRACE("(%p, %p)\n", iface, pTrigger); + TaskTriggerImpl *This = impl_from_ITaskTrigger(iface); - if (!pTrigger) return E_INVALIDARG; + TRACE("(%p, %p)\n", iface, trigger); - /* Native implementation doesn't verify equivalent cbTriggerSize fields */ + if (!trigger) return E_INVALIDARG; - /* Copy relevant fields of the structure */ - pTrigger->cbTriggerSize = This->triggerCond.cbTriggerSize; - pTrigger->Reserved1 = 0; - pTrigger->wBeginYear = This->triggerCond.wBeginYear; - pTrigger->wBeginMonth = This->triggerCond.wBeginMonth; - pTrigger->wBeginDay = This->triggerCond.wBeginDay; - pTrigger->wEndYear = This->triggerCond.wEndYear; - pTrigger->wEndMonth = This->triggerCond.wEndMonth; - pTrigger->wEndDay = This->triggerCond.wEndDay; - pTrigger->wStartHour = This->triggerCond.wStartHour; - pTrigger->wStartMinute = This->triggerCond.wStartMinute; - pTrigger->MinutesDuration = This->triggerCond.MinutesDuration; - pTrigger->MinutesInterval = This->triggerCond.MinutesInterval; - pTrigger->rgFlags = This->triggerCond.rgFlags; - pTrigger->TriggerType = This->triggerCond.TriggerType; - switch (This->triggerCond.TriggerType) - { - case TASK_TIME_TRIGGER_DAILY: - pTrigger->Type.Daily.DaysInterval = - This->triggerCond.Type.Daily.DaysInterval; - break; - case TASK_TIME_TRIGGER_WEEKLY: - pTrigger->Type.Weekly.WeeksInterval = - This->triggerCond.Type.Weekly.WeeksInterval; - pTrigger->Type.Weekly.rgfDaysOfTheWeek = - This->triggerCond.Type.Weekly.rgfDaysOfTheWeek; - break; - case TASK_TIME_TRIGGER_MONTHLYDATE: - pTrigger->Type.MonthlyDate.rgfDays = - This->triggerCond.Type.MonthlyDate.rgfDays; - pTrigger->Type.MonthlyDate.rgfMonths = - This->triggerCond.Type.MonthlyDate.rgfMonths; - break; - case TASK_TIME_TRIGGER_MONTHLYDOW: - pTrigger->Type.MonthlyDOW.wWhichWeek = - This->triggerCond.Type.MonthlyDOW.wWhichWeek; - pTrigger->Type.MonthlyDOW.rgfDaysOfTheWeek = - This->triggerCond.Type.MonthlyDOW.rgfDaysOfTheWeek; - pTrigger->Type.MonthlyDOW.rgfMonths = - This->triggerCond.Type.MonthlyDOW.rgfMonths; - break; - case TASK_TIME_TRIGGER_ONCE: - case TASK_EVENT_TRIGGER_ON_IDLE: - case TASK_EVENT_TRIGGER_AT_SYSTEMSTART: - case TASK_EVENT_TRIGGER_AT_LOGON: - default: - break; - } - pTrigger->Reserved2 = 0; - pTrigger->wRandomMinutesInterval = 0; - return S_OK; + return task_get_trigger(This->parent_task, This->trigger_index, trigger); } static HRESULT WINAPI MSTASK_ITaskTrigger_GetTriggerString( @@ -286,11 +133,11 @@ static const ITaskTriggerVtbl MSTASK_ITaskTriggerVtbl = MSTASK_ITaskTrigger_GetTriggerString }; -HRESULT TaskTriggerConstructor(LPVOID *ppObj) +HRESULT TaskTriggerConstructor(ITask *task, WORD idx, ITaskTrigger **trigger) { TaskTriggerImpl *This; - SYSTEMTIME time; - TRACE("(%p)\n", ppObj); + + TRACE("(%p, %u, %p)\n", task, idx, trigger); This = heap_alloc(sizeof(*This)); if (!This) @@ -299,21 +146,11 @@ HRESULT TaskTriggerConstructor(LPVOID *ppObj) This->ITaskTrigger_iface.lpVtbl = &MSTASK_ITaskTriggerVtbl; This->ref = 1; - /* Most fields of triggerCond default to zero. Initialize other - * fields to default values. */ - memset(&This->triggerCond, 0, sizeof(TASK_TRIGGER)); - GetLocalTime(&time); - This->triggerCond.cbTriggerSize = sizeof(This->triggerCond); - This->triggerCond.wBeginYear = time.wYear; - This->triggerCond.wBeginMonth = time.wMonth; - This->triggerCond.wBeginDay = time.wDay; - This->triggerCond.wStartHour = time.wHour; - This->triggerCond.wStartMinute = time.wMinute; - This->triggerCond.rgFlags = TASK_TRIGGER_FLAG_DISABLED; - This->triggerCond.TriggerType = TASK_TIME_TRIGGER_DAILY, - This->triggerCond.Type.Daily.DaysInterval = 1; + ITask_AddRef(task); + This->parent_task = task; + This->trigger_index = idx; - *ppObj = &This->ITaskTrigger_iface; + *trigger = &This->ITaskTrigger_iface; InterlockedIncrement(&dll_ref); return S_OK; } diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index ab99af7b5d..9a20a5672c 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -499,14 +499,12 @@ static void test_trigger_manager(void) hr = ITask_CreateTrigger(task, &idx, &trigger0); ok(hr == S_OK, "got %#x\n", hr); ok(idx == 0, "got %u\n", idx); -todo_wine ok(obj_refcount(task) == 2, "got %u\n", obj_refcount(task)); idx = 0xdead; hr = ITask_CreateTrigger(task, &idx, &trigger1); ok(hr == S_OK, "got %#x\n", hr); ok(idx == 1, "got %u\n", idx); -todo_wine ok(obj_refcount(task) == 3, "got %u\n", obj_refcount(task)); count = 0xdead; @@ -524,9 +522,7 @@ todo_wine hr = get_task_trigger(task, 0, &state); ok(hr == S_OK, "got %#x\n", hr); -todo_wine ok(state.wBeginYear == 3000, "got %u\n", state.wBeginYear); -todo_wine ok(state.TriggerType == TASK_TIME_TRIGGER_ONCE, "got %u\n", state.TriggerType); hr = ITaskTrigger_GetTrigger(trigger1, &state1); @@ -539,7 +535,6 @@ todo_wine hr = get_task_trigger(task, 1, &state); ok(hr == S_OK, "got %#x\n", hr); -todo_wine ok(state.wBeginYear == 2000, "got %u\n", state.wBeginYear); ok(state.TriggerType == TASK_TIME_TRIGGER_DAILY, "got %u\n", state.TriggerType); @@ -552,14 +547,11 @@ todo_wine hr = get_task_trigger(task, 0, &state); ok(hr == S_OK, "got %#x\n", hr); -todo_wine ok(state.wBeginYear == 3000, "got %u\n", state.wBeginYear); -todo_wine ok(state.TriggerType == TASK_TIME_TRIGGER_ONCE, "got %u\n", state.TriggerType); hr = get_task_trigger(task, 1, &state); ok(hr == S_OK, "got %#x\n", hr); -todo_wine ok(state.wBeginYear == 2000, "got %u\n", state.wBeginYear); ok(state.TriggerType == TASK_TIME_TRIGGER_DAILY, "got %u\n", state.TriggerType); @@ -573,7 +565,6 @@ todo_wine hr = get_task_trigger(task, 0, &state); ok(hr == S_OK, "got %#x\n", hr); -todo_wine ok(state.wBeginYear == 2000, "got %u\n", state.wBeginYear); ok(state.TriggerType == TASK_TIME_TRIGGER_DAILY, "got %u\n", state.TriggerType); @@ -584,7 +575,6 @@ todo_wine ok(hr == S_OK, "got %#x\n", hr); hr = ITaskTrigger_SetTrigger(trigger1, &state1); -todo_wine ok(hr == E_FAIL, "got %#x\n", hr); count = 0xdead; @@ -592,7 +582,6 @@ todo_wine ok(hr == S_OK, "got %#x\n", hr); ok(count == 1, "got %u\n", count); -todo_wine ok(obj_refcount(task) == 3, "got %u\n", obj_refcount(task)); ref = ITaskTrigger_Release(trigger0); -- 2.16.3

1 0

[PATCH 6/7] mstask/tests: Add another set of tests for trigger management.
by Dmitry Timoshkov 14 May '18

14 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/tests/task_trigger.c | 153 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index fe757e812a..ab99af7b5d 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -28,6 +28,13 @@ static ITaskScheduler *test_task_scheduler; +static DWORD obj_refcount(void *obj_to_check) +{ + IUnknown *obj = obj_to_check; + IUnknown_AddRef(obj); + return IUnknown_Release(obj); +} + static BOOL compare_trigger_state(TASK_TRIGGER found_state, TASK_TRIGGER expected_state) { @@ -453,6 +460,151 @@ static void test_GetNextRunTime(void) ITask_Release(task); } +static HRESULT get_task_trigger(ITask *task, WORD idx, TASK_TRIGGER *state) +{ + HRESULT hr; + ITaskTrigger *trigger; + + hr = ITask_GetTrigger(task, idx, &trigger); + if (hr != S_OK) return hr; + + memset(state, 0x11, sizeof(*state)); + hr = ITaskTrigger_GetTrigger(trigger, state); + + ITaskTrigger_Release(trigger); + return hr; +} + +static void test_trigger_manager(void) +{ + static const WCHAR task_name[] = { 'T','e','s','t','i','n','g',0 }; + HRESULT hr; + ITask *task; + ITaskTrigger *trigger0, *trigger1; + TASK_TRIGGER state0, state1, state; + WORD count, idx; + DWORD ref; + + hr = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "got %#x\n", hr); + ok(obj_refcount(task) == 1, "got %u\n", obj_refcount(task)); + + count = 0xdead; + hr = ITask_GetTriggerCount(task, &count); + ok(hr == S_OK, "got %#x\n", hr); + ok(count == 0, "got %u\n", count); + + idx = 0xdead; + hr = ITask_CreateTrigger(task, &idx, &trigger0); + ok(hr == S_OK, "got %#x\n", hr); + ok(idx == 0, "got %u\n", idx); +todo_wine + ok(obj_refcount(task) == 2, "got %u\n", obj_refcount(task)); + + idx = 0xdead; + hr = ITask_CreateTrigger(task, &idx, &trigger1); + ok(hr == S_OK, "got %#x\n", hr); + ok(idx == 1, "got %u\n", idx); +todo_wine + ok(obj_refcount(task) == 3, "got %u\n", obj_refcount(task)); + + count = 0xdead; + hr = ITask_GetTriggerCount(task, &count); + ok(hr == S_OK, "got %#x\n", hr); + ok(count == 2, "got %u\n", count); + + hr = ITaskTrigger_GetTrigger(trigger0, &state0); + ok(hr == S_OK, "got %#x\n", hr); + state0.wBeginYear = 3000; + state0.rgFlags = 0; + state0.TriggerType = TASK_TIME_TRIGGER_ONCE; + hr = ITaskTrigger_SetTrigger(trigger0, &state0); + ok(hr == S_OK, "got %#x\n", hr); + + hr = get_task_trigger(task, 0, &state); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(state.wBeginYear == 3000, "got %u\n", state.wBeginYear); +todo_wine + ok(state.TriggerType == TASK_TIME_TRIGGER_ONCE, "got %u\n", state.TriggerType); + + hr = ITaskTrigger_GetTrigger(trigger1, &state1); + ok(hr == S_OK, "got %#x\n", hr); + state1.wBeginYear = 2000; + state1.rgFlags = 0; + state1.TriggerType = TASK_TIME_TRIGGER_DAILY; + hr = ITaskTrigger_SetTrigger(trigger1, &state1); + ok(hr == S_OK, "got %#x\n", hr); + + hr = get_task_trigger(task, 1, &state); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(state.wBeginYear == 2000, "got %u\n", state.wBeginYear); + ok(state.TriggerType == TASK_TIME_TRIGGER_DAILY, "got %u\n", state.TriggerType); + + ref = ITaskTrigger_Release(trigger0); + ok(ref == 0, "got %u\n", ref); + ref = ITaskTrigger_Release(trigger1); + ok(ref == 0, "got %u\n", ref); + + ok(obj_refcount(task) == 1, "got %u\n", obj_refcount(task)); + + hr = get_task_trigger(task, 0, &state); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(state.wBeginYear == 3000, "got %u\n", state.wBeginYear); +todo_wine + ok(state.TriggerType == TASK_TIME_TRIGGER_ONCE, "got %u\n", state.TriggerType); + + hr = get_task_trigger(task, 1, &state); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(state.wBeginYear == 2000, "got %u\n", state.wBeginYear); + ok(state.TriggerType == TASK_TIME_TRIGGER_DAILY, "got %u\n", state.TriggerType); + + hr = ITask_GetTrigger(task, 0, &trigger0); + ok(hr == S_OK, "got %#x\n", hr); + hr = ITask_GetTrigger(task, 1, &trigger1); + ok(hr == S_OK, "got %#x\n", hr); + + hr = ITask_DeleteTrigger(task, 0); + ok(hr == S_OK, "got %#x\n", hr); + + hr = get_task_trigger(task, 0, &state); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(state.wBeginYear == 2000, "got %u\n", state.wBeginYear); + ok(state.TriggerType == TASK_TIME_TRIGGER_DAILY, "got %u\n", state.TriggerType); + + hr = get_task_trigger(task, 1, &state); + ok(hr == SCHED_E_TRIGGER_NOT_FOUND, "got %#x\n", hr); + + hr = ITaskTrigger_SetTrigger(trigger0, &state0); + ok(hr == S_OK, "got %#x\n", hr); + + hr = ITaskTrigger_SetTrigger(trigger1, &state1); +todo_wine + ok(hr == E_FAIL, "got %#x\n", hr); + + count = 0xdead; + hr = ITask_GetTriggerCount(task, &count); + ok(hr == S_OK, "got %#x\n", hr); + ok(count == 1, "got %u\n", count); + +todo_wine + ok(obj_refcount(task) == 3, "got %u\n", obj_refcount(task)); + + ref = ITaskTrigger_Release(trigger0); + ok(ref == 0, "got %u\n", ref); + + ref = ITaskTrigger_Release(trigger1); + ok(ref == 0, "got %u\n", ref); + + ref = ITask_Release(task); + ok(ref == 0, "got %u\n", ref); +} + START_TEST(task_trigger) { HRESULT hr; @@ -466,6 +618,7 @@ START_TEST(task_trigger) test_SetTrigger_GetTrigger(); test_task_trigger(); test_GetNextRunTime(); + test_trigger_manager(); ITaskScheduler_Release(test_task_scheduler); CoUninitialize(); -- 2.16.3

1 0

[PATCH 5/7] mstask: ITaskTrigger::GetTrigger() should fail on NULL input.
by Dmitry Timoshkov 14 May '18

14 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task_trigger.c | 2 ++ dlls/mstask/tests/task_trigger.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/dlls/mstask/task_trigger.c b/dlls/mstask/task_trigger.c index 6d11817e00..0f24e1f998 100644 --- a/dlls/mstask/task_trigger.c +++ b/dlls/mstask/task_trigger.c @@ -211,6 +211,8 @@ static HRESULT WINAPI MSTASK_ITaskTrigger_GetTrigger( TRACE("(%p, %p)\n", iface, pTrigger); + if (!pTrigger) return E_INVALIDARG; + /* Native implementation doesn't verify equivalent cbTriggerSize fields */ /* Copy relevant fields of the structure */ diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index e22b2ae2dd..fe757e812a 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -139,6 +139,9 @@ static void test_SetTrigger_GetTrigger(void) hres = ITaskTrigger_SetTrigger(test_trigger, NULL); ok(hres == E_INVALIDARG, "got %#x\n", hres); + hres = ITaskTrigger_GetTrigger(test_trigger, NULL); + ok(hres == E_INVALIDARG, "got %#x\n", hres); + /* Setup a trigger with base values for this test run */ GetLocalTime(&time); empty_trigger_state.wStartHour = time.wHour; -- 2.16.3

1 0

[PATCH 4/7] mstask: ITaskTrigger::SetTrigger() should fail on NULL input.
by Dmitry Timoshkov 14 May '18

14 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task_trigger.c | 2 ++ dlls/mstask/tests/task_trigger.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/dlls/mstask/task_trigger.c b/dlls/mstask/task_trigger.c index 888fb66a4f..6d11817e00 100644 --- a/dlls/mstask/task_trigger.c +++ b/dlls/mstask/task_trigger.c @@ -103,6 +103,8 @@ static HRESULT WINAPI MSTASK_ITaskTrigger_SetTrigger( TRACE("(%p, %p)\n", iface, pTrigger); + if (!pTrigger) return E_INVALIDARG; + /* Verify valid structure size */ if (pTrigger->cbTriggerSize != sizeof(*pTrigger)) return E_INVALIDARG; diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index 3e2762079d..e22b2ae2dd 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -136,6 +136,9 @@ static void test_SetTrigger_GetTrigger(void) hres = ITask_CreateTrigger(test_task, &idx, &test_trigger); ok(hres == S_OK, "got %#x\n", hres); + hres = ITaskTrigger_SetTrigger(test_trigger, NULL); + ok(hres == E_INVALIDARG, "got %#x\n", hres); + /* Setup a trigger with base values for this test run */ GetLocalTime(&time); empty_trigger_state.wStartHour = time.wHour; -- 2.16.3

1 0

[PATCH 3/7] mstask/tests: Make task trigger tests independent.
by Dmitry Timoshkov 14 May '18

14 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/tests/task_trigger.c | 54 +++++++++------------------------------- 1 file changed, 12 insertions(+), 42 deletions(-) diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index ab081a74ca..3e2762079d 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -27,37 +27,6 @@ #include "wine/test.h" static ITaskScheduler *test_task_scheduler; -static ITask *test_task; -static ITaskTrigger *test_trigger; -static WORD trigger_index; - -static BOOL setup_trigger(void) -{ - HRESULT hres; - const WCHAR task_name[] = {'T','e','s','t','i','n','g', 0}; - - hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, - &CLSID_CTask, &IID_ITask, (IUnknown**)&test_task); - if(hres != S_OK) - { - ITaskScheduler_Release(test_task_scheduler); - return FALSE; - } - hres = ITask_CreateTrigger(test_task, &trigger_index, &test_trigger); - if(hres != S_OK) - { - ITask_Release(test_task); - ITaskScheduler_Release(test_task_scheduler); - return FALSE; - } - return TRUE; -} - -static void cleanup_trigger(void) -{ - ITaskTrigger_Release(test_trigger); - ITask_Release(test_task); -} static BOOL compare_trigger_state(TASK_TRIGGER found_state, TASK_TRIGGER expected_state) @@ -135,8 +104,11 @@ static BOOL compare_trigger_state(TASK_TRIGGER found_state, static void test_SetTrigger_GetTrigger(void) { - BOOL setup; + static const WCHAR task_name[] = { 'T','e','s','t','i','n','g',0 }; + ITask *test_task; + ITaskTrigger *test_trigger; HRESULT hres; + WORD idx; TASK_TRIGGER trigger_state; TASK_TRIGGER empty_trigger_state = { sizeof(trigger_state), 0, @@ -157,13 +129,12 @@ static void test_SetTrigger_GetTrigger(void) }; SYSTEMTIME time; - setup = setup_trigger(); - ok(setup, "Failed to setup test_task\n"); - if (!setup) - { - skip("Failed to create task. Skipping tests.\n"); - return; - } + hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&test_task); + ok(hres == S_OK, "got %#x\n", hres); + + hres = ITask_CreateTrigger(test_task, &idx, &test_trigger); + ok(hres == S_OK, "got %#x\n", hres); /* Setup a trigger with base values for this test run */ GetLocalTime(&time); @@ -367,9 +338,8 @@ static void test_SetTrigger_GetTrigger(void) ok(compare_trigger_state(trigger_state, normal_trigger_state), "Invalid state\n"); - - cleanup_trigger(); - return; + ITaskTrigger_Release(test_trigger); + ITask_Release(test_task); } static void test_task_trigger(void) -- 2.16.3

1 0

[PATCH 2/7] mstask: Implement ITask::SetFlags().
by Dmitry Timoshkov 14 May '18

14 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 11 +++++++---- dlls/mstask/tests/task.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 9cdf92e319..68452afa4f 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -491,11 +491,14 @@ static HRESULT WINAPI MSTASK_ITask_GetErrorRetryInterval(ITask *iface, WORD *int return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_SetFlags( - ITask* iface, - DWORD dwFlags) +static HRESULT WINAPI MSTASK_ITask_SetFlags(ITask *iface, DWORD flags) { - FIXME("(%p, 0x%08x): stub\n", iface, dwFlags); + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p, 0x%08x)\n", iface, flags); + This->flags &= 0xffff8000; + This->flags |= flags & 0x7fff; + This->is_dirty = TRUE; return S_OK; } diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 58c102060b..0e2b4339ad 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -683,6 +683,43 @@ static void test_Run(void) ok(hr == S_OK, "got %#x\n", hr); } +static void test_SetFlags(void) +{ + HRESULT hr; + ITask *task; + DWORD flags; + + hr = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "got %#x\n", hr); + + hr = ITask_SetFlags(task, 0); + ok(hr == S_OK, "got %#x\n", hr); + + flags = 0xdeadbeef; + hr = ITask_GetFlags(task, &flags); + ok(hr == S_OK, "got %#x\n", hr); + ok(flags == 0, "got %#x\n", flags); + + hr = ITask_SetFlags(task, 0xffffffff); + ok(hr == S_OK, "got %#x\n", hr); + + flags = 0xdeadbeef; + hr = ITask_GetFlags(task, &flags); + ok(hr == S_OK, "got %#x\n", hr); + ok(flags == 0x7fff, "got %#x\n", flags); + + hr = ITask_SetFlags(task, 0x9234); + ok(hr == S_OK, "got %#x\n", hr); + + flags = 0xdeadbeef; + hr = ITask_GetFlags(task, &flags); + ok(hr == S_OK, "got %#x\n", hr); + ok(flags == 0x1234, "got %#x\n", flags); + + ITask_Release(task); +} + START_TEST(task) { HRESULT hr; @@ -700,6 +737,7 @@ START_TEST(task) test_SetAccountInformation_GetAccountInformation(); test_task_state(); test_Run(); + test_SetFlags(); ITaskScheduler_Release(scheduler); CoUninitialize(); -- 2.16.3

1 0

[PATCH 1/7] mstask/tests: Make task tests independent.
by Dmitry Timoshkov 14 May '18

14 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/tests/task.c | 155 ++++++++++++++--------------------------------- 1 file changed, 46 insertions(+), 109 deletions(-) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 2e8ee93630..58c102060b 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -25,35 +25,10 @@ #include "mstask.h" #include "wine/test.h" -static ITaskScheduler *test_task_scheduler; -static ITask *test_task; +static ITaskScheduler *scheduler; +static const WCHAR task_name[] = {'T','e','s','t','i','n','g',0}; static const WCHAR empty[] = {0}; -static BOOL setup_task(void) -{ - HRESULT hres; - const WCHAR task_name[] = {'T','e','s','t','i','n','g', 0}; - - hres = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, - &IID_ITaskScheduler, (void **) &test_task_scheduler); - if(hres != S_OK) - return FALSE; - hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, - &IID_ITask, (IUnknown**)&test_task); - if(hres != S_OK) - { - ITaskScheduler_Release(test_task_scheduler); - return FALSE; - } - return TRUE; -} - -static void cleanup_task(void) -{ - ITask_Release(test_task); - ITaskScheduler_Release(test_task_scheduler); -} - static LPCWSTR path_resolve_name(LPCWSTR base_name) { static WCHAR buffer[MAX_PATH]; @@ -72,7 +47,7 @@ static LPCWSTR path_resolve_name(LPCWSTR base_name) static void test_SetApplicationName_GetApplicationName(void) { - BOOL setup; + ITask *test_task; HRESULT hres; LPWSTR stored_name; LPCWSTR full_name; @@ -82,13 +57,9 @@ static void test_SetApplicationName_GetApplicationName(void) 'n','o','t','e','p','a','d','.','e','x','e', 0}; const WCHAR notepad[] = {'n','o','t','e','p','a','d', 0}; - setup = setup_task(); - ok(setup, "Failed to setup test_task\n"); - if (!setup) - { - skip("Failed to create task. Skipping tests.\n"); - return; - } + hres = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&test_task); + ok(hres == S_OK, "Failed to setup test_task\n"); /* Attempt getting before setting application name */ hres = ITask_GetApplicationName(test_task, &stored_name); @@ -176,54 +147,39 @@ static void test_SetApplicationName_GetApplicationName(void) CoTaskMemFree(stored_name); } - cleanup_task(); - return; + ITask_Release(test_task); } static void test_CreateTrigger(void) { - BOOL setup; + ITask *test_task; HRESULT hres; WORD trigger_index; ITaskTrigger *test_trigger; - setup = setup_task(); - ok(setup, "Failed to setup test_task\n"); - if (!setup) - { - skip("Failed to create task. Skipping tests.\n"); - return; - } + hres = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&test_task); + ok(hres == S_OK, "Failed to setup test_task\n"); hres = ITask_CreateTrigger(test_task, &trigger_index, &test_trigger); ok(hres == S_OK, "Failed to create trigger: 0x%08x\n", hres); - if (hres != S_OK) - { - cleanup_task(); - return; - } ITaskTrigger_Release(test_trigger); - cleanup_task(); - return; + ITask_Release(test_task); } static void test_SetParameters_GetParameters(void) { - BOOL setup; + ITask *test_task; HRESULT hres; LPWSTR parameters; const WCHAR parameters_a[] = {'f','o','o','.','t','x','t', 0}; const WCHAR parameters_b[] = {'f','o','o','.','t','x','t',' ', 'b','a','r','.','t','x','t', 0}; - setup = setup_task(); - ok(setup, "Failed to setup test_task\n"); - if (!setup) - { - skip("Failed to create task. Skipping tests.\n"); - return; - } + hres = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&test_task); + ok(hres == S_OK, "Failed to setup test_task\n"); /* Get parameters before setting them */ hres = ITask_GetParameters(test_task, &parameters); @@ -274,26 +230,21 @@ static void test_SetParameters_GetParameters(void) CoTaskMemFree(parameters); } - cleanup_task(); - return; + ITask_Release(test_task); } static void test_SetComment_GetComment(void) { - BOOL setup; + ITask *test_task; HRESULT hres; LPWSTR comment; const WCHAR comment_a[] = {'C','o','m','m','e','n','t','.', 0}; const WCHAR comment_b[] = {'L','o','n','g','e','r',' ', 'c','o','m','m','e','n','t','.', 0}; - setup = setup_task(); - ok(setup, "Failed to setup test_task\n"); - if (!setup) - { - skip("Failed to create task. Skipping tests.\n"); - return; - } + hres = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&test_task); + ok(hres == S_OK, "Failed to setup test_task\n"); /* Get comment before setting it*/ hres = ITask_GetComment(test_task, &comment); @@ -344,23 +295,18 @@ static void test_SetComment_GetComment(void) CoTaskMemFree(comment); } - cleanup_task(); - return; + ITask_Release(test_task); } static void test_SetMaxRunTime_GetMaxRunTime(void) { - BOOL setup; + ITask *test_task; HRESULT hres; DWORD max_run_time; - setup = setup_task(); - ok(setup, "Failed to setup test_task\n"); - if (!setup) - { - skip("Failed to create task. Skipping tests.\n"); - return; - } + hres = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&test_task); + ok(hres == S_OK, "Failed to setup test_task\n"); /* Default time is 3 days: * 3 days * 24 hours * 60 minutes * 60 seconds * 1000 ms = 259200000 */ @@ -401,13 +347,12 @@ static void test_SetMaxRunTime_GetMaxRunTime(void) ok(hres == S_OK, "Failed to get max runtime: 0x%08x\n", hres); ok(max_run_time == INFINITE, "Expected INFINITE: %d\n", max_run_time); - cleanup_task(); - return; + ITask_Release(test_task); } static void test_SetAccountInformation_GetAccountInformation(void) { - BOOL setup; + ITask *test_task; HRESULT hres; LPWSTR account_name; const WCHAR dummy_account_name[] = {'N', 'o', 'S', 'u', 'c', 'h', @@ -415,13 +360,9 @@ static void test_SetAccountInformation_GetAccountInformation(void) const WCHAR dummy_account_name_b[] = {'N', 'o', 'S', 'u', 'c', 'h', 'A', 'c', 'c', 'o', 'u', 'n', 't', 'B', 0}; - setup = setup_task(); - ok(setup, "Failed to setup test_task\n"); - if (!setup) - { - skip("Failed to create task. Skipping tests.\n"); - return; - } + hres = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&test_task); + ok(hres == S_OK, "Failed to setup test_task\n"); /* Get account information before it is set */ hres = ITask_GetAccountInformation(test_task, &account_name); @@ -431,8 +372,7 @@ static void test_SetAccountInformation_GetAccountInformation(void) if (hres == SCHED_E_NO_SECURITY_SERVICES || hres == SCHED_E_SERVICE_NOT_RUNNING) { win_skip("Security services are not supported\n"); - cleanup_task(); - return; + ITask_Release(test_task); } ok(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hres == SCHED_E_CANNOT_OPEN_TASK, @@ -493,25 +433,20 @@ static void test_SetAccountInformation_GetAccountInformation(void) CoTaskMemFree(account_name); } - cleanup_task(); - return; + ITask_Release(test_task); } static void test_task_state(void) { - BOOL setup; + ITask *test_task; HRESULT hr, status; DWORD flags, val; WORD val1, val2; SYSTEMTIME st; - setup = setup_task(); - ok(setup, "Failed to setup test_task\n"); - if (!setup) - { - skip("Failed to create task. Skipping tests.\n"); - return; - } + hr = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&test_task); + ok(hr == S_OK, "Failed to setup test_task\n"); if (0) /* crashes under Windows */ hr = ITask_GetFlags(test_task, NULL); @@ -588,7 +523,7 @@ static void test_task_state(void) ok(st.wMinute == 0, "got %u\n", st.wMinute); ok(st.wSecond == 0, "got %u\n", st.wSecond); - cleanup_task(); + ITask_Release(test_task); } static void save_job(ITask *task) @@ -609,7 +544,6 @@ static void test_Run(void) { static const WCHAR wine_test_runW[] = { 'w','i','n','e','_','t','e','s','t','_','r','u','n',0 }; static const WCHAR cmdW[] = { 'c','m','d','.','e','x','e',0 }; - ITaskScheduler *scheduler; ITask *task; ITaskTrigger *trigger; WORD idx, i; @@ -617,10 +551,6 @@ static void test_Run(void) SYSTEMTIME st; HRESULT hr, status; - hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, - &IID_ITaskScheduler, (void **)&scheduler); - ok(hr == S_OK, "got %#x\n", hr); - /* cleanup after previous runs */ ITaskScheduler_Delete(scheduler, wine_test_runW); @@ -751,12 +681,17 @@ static void test_Run(void) hr = ITaskScheduler_Delete(scheduler, wine_test_runW); ok(hr == S_OK, "got %#x\n", hr); - ITaskScheduler_Release(scheduler); } START_TEST(task) { + HRESULT hr; + CoInitialize(NULL); + hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, + &IID_ITaskScheduler, (void **)&scheduler); + ok(hr == S_OK, "failed to create task scheduler: %#x\n", hr); + test_SetApplicationName_GetApplicationName(); test_CreateTrigger(); test_SetParameters_GetParameters(); @@ -765,5 +700,7 @@ START_TEST(task) test_SetAccountInformation_GetAccountInformation(); test_task_state(); test_Run(); + + ITaskScheduler_Release(scheduler); CoUninitialize(); } -- 2.16.3

1 0

[PATCH] gdi32/tests: Check array index limit first.
by Andrey Gusev 14 May '18

14 May '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/gdi32/tests/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 6243a6d339..2b214a07aa 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -202,7 +202,7 @@ static void check_font(const char* test, const LOGFONTA* lf, HFONT hfont) ret = GetObjectA(hfont, sizeof(getobj_lf), &getobj_lf); /* NT4 tries to be clever and only returns the minimum length */ - while (lf->lfFaceName[minlen] && minlen < LF_FACESIZE-1) + while (minlen < LF_FACESIZE-1 && lf->lfFaceName[minlen]) minlen++; minlen += FIELD_OFFSET(LOGFONTA, lfFaceName) + 1; ok(ret == sizeof(LOGFONTA) || ret == minlen, "%s: GetObject returned %d\n", test, ret); -- 2.14.3

3 2

[PATCH] Add PLATFORM_OPENBSD to winebuild.
by Daniel Dickman 14 May '18

14 May '18

--- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 2 ++ tools/winebuild/utils.c | 3 +++ 3 files changed, 6 insertions(+) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 90e8e34e44..9596743406 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -150,6 +150,7 @@ enum target_platform PLATFORM_UNSPECIFIED, PLATFORM_APPLE, PLATFORM_FREEBSD, + PLATFORM_OPENBSD, PLATFORM_SOLARIS, PLATFORM_WINDOWS }; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index f4656f9051..1188bf89fd 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -65,6 +65,8 @@ enum target_cpu target_cpu = CPU_ARM64; enum target_platform target_platform = PLATFORM_APPLE; #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) enum target_platform target_platform = PLATFORM_FREEBSD; +#elif defined(__OpenBSD__) +enum target_platform target_platform = PLATFORM_OPENBSD; #elif defined(__sun) enum target_platform target_platform = PLATFORM_SOLARIS; #elif defined(_WIN32) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 6e01f1a526..bcebdc08ad 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -445,6 +445,9 @@ struct strarray get_ld_command(void) case PLATFORM_FREEBSD: strarray_add( &args, "-m", (force_pointer_size == 8) ? "elf_x86_64_fbsd" : "elf_i386_fbsd", NULL ); break; + case PLATFORM_OPENBSD: + strarray_add( &args, "-m", (force_pointer_size == 8) ? "elf_x86_64_obsd" : "elf_i386_obsd", NULL ); + break; default: switch(target_cpu) { -- 2.16.2

1 0

[PATCH] secur32: Set output buffer size to zero during handshake when no data needs to be sent.
by Alistair Leslie-Hughes 14 May '18

14 May '18

From: Michael Müller <michael(a)fds-team.de> Fixes: https://bugs.winehq.org/show_bug.cgi?id=40271 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/secur32/schannel.c | 19 ++++++++++++------- dlls/secur32/tests/schannel.c | 10 ++++++++-- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 90b9782..f0d271e 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -901,6 +901,18 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( /* Perform the TLS handshake */ ret = schan_imp_handshake(ctx->session); + out_buffers = &ctx->transport.out; + if (out_buffers->current_buffer_idx != -1) + { + SecBuffer *buffer = &out_buffers->desc->pBuffers[out_buffers->current_buffer_idx]; + buffer->cbBuffer = out_buffers->offset; + } + else if (out_buffers->desc && out_buffers->desc->cBuffers > 0) + { + SecBuffer *buffer = &out_buffers->desc->pBuffers[0]; + buffer->cbBuffer = 0; + } + if(ctx->transport.in.offset && ctx->transport.in.offset != pInput->pBuffers[0].cbBuffer) { if(pInput->cBuffers<2 || pInput->pBuffers[1].BufferType!=SECBUFFER_EMPTY) return SEC_E_INVALID_TOKEN; @@ -909,13 +921,6 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( pInput->pBuffers[1].cbBuffer = pInput->pBuffers[0].cbBuffer-ctx->transport.in.offset; } - out_buffers = &ctx->transport.out; - if (out_buffers->current_buffer_idx != -1) - { - SecBuffer *buffer = &out_buffers->desc->pBuffers[out_buffers->current_buffer_idx]; - buffer->cbBuffer = out_buffers->offset; - } - *pfContextAttr = 0; if (ctx->req_ctx_attr & ISC_REQ_REPLAY_DETECT) *pfContextAttr |= ISC_RET_REPLAY_DETECT; diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 21ebb62..1a37c52 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -772,7 +772,6 @@ todo_wine ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); ok(status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INVALID_TOKEN, got %08x\n", status); -todo_wine ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); buffers[0].pBuffers[0].cbBuffer = 0; @@ -782,9 +781,15 @@ todo_wine todo_wine ok(status == SEC_E_INSUFFICIENT_MEMORY || status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INSUFFICIENT_MEMORY or SEC_E_INVALID_TOKEN, got %08x\n", status); + ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); - buffers[0].pBuffers[0].cbBuffer = buf_size; + status = InitializeSecurityContextA(&cred_handle, NULL, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + 0, 0, NULL, 0, &context, NULL, &attrs, NULL); +todo_wine + ok(status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INVALID_TOKEN, got %08x\n", status); + buffers[0].pBuffers[0].cbBuffer = buf_size; status = InitializeSecurityContextA(&cred_handle, NULL, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, NULL, 0, &context, &buffers[0], &attrs, NULL); @@ -859,6 +864,7 @@ todo_wine buffers[1].pBuffers[0].cbBuffer = buf_size; } + ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); ok(status == SEC_E_OK || broken(status == SEC_E_INVALID_TOKEN) /* WinNT */, "InitializeSecurityContext failed: %08x\n", status); if(status != SEC_E_OK) { -- 1.9.1

1 0

[PATCH] shell32: Choose return value for SHFileOperationA depending on windows version
by Alistair Leslie-Hughes 14 May '18

14 May '18

Fixes: https://bugs.winehq.org/show_bug.cgi?id=37916 Based off patch by Michael Müller. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shlfileop.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 4507b72..c7bd54d 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -882,6 +882,10 @@ int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp) if (ForFree) { retCode = SHFileOperationW(&nFileOp); + /* Windows 95/98 returns S_OK for this case. */ + if (retCode == ERROR_ACCESS_DENIED && (GetVersion() & 0x80000000)) + retCode = S_OK; + heap_free(ForFree); /* we cannot use wString, it was changed */ break; } -- 1.9.1

1 0

[PATCH] po: Update Czech translation
by AsciiWolf 13 May '18

13 May '18

Hello, I have updated the Czech translation. The last time it was updated was in 2013. Feel free to merge this patch. Regards, Daniel Rusek

2 2

[PATCH v2 1/2] mp3dmod/tests: Add some tests for decoding.
by Zebediah Figura 13 May '18

13 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- configure | 1 + configure.ac | 1 + dlls/mp3dmod/tests/Makefile.in | 5 + dlls/mp3dmod/tests/mp3dmod.c | 233 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 240 insertions(+) create mode 100644 dlls/mp3dmod/tests/Makefile.in create mode 100644 dlls/mp3dmod/tests/mp3dmod.c diff --git a/configure b/configure index dbe5cd5..25ccf4c 100755 --- a/configure +++ b/configure @@ -18808,6 +18808,7 @@ wine_fn_config_makefile dlls/monodebg.vxd enable_win16 wine_fn_config_makefile dlls/mountmgr.sys enable_mountmgr_sys wine_fn_config_makefile dlls/mouse.drv16 enable_win16 wine_fn_config_makefile dlls/mp3dmod enable_mp3dmod +wine_fn_config_makefile dlls/mp3dmod/tests enable_tests wine_fn_config_makefile dlls/mpr enable_mpr wine_fn_config_makefile dlls/mpr/tests enable_tests wine_fn_config_makefile dlls/mprapi enable_mprapi diff --git a/configure.ac b/configure.ac index 2c4e05a..05c1cd0 100644 --- a/configure.ac +++ b/configure.ac @@ -3402,6 +3402,7 @@ WINE_CONFIG_MAKEFILE(dlls/monodebg.vxd,enable_win16) WINE_CONFIG_MAKEFILE(dlls/mountmgr.sys) WINE_CONFIG_MAKEFILE(dlls/mouse.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/mp3dmod) +WINE_CONFIG_MAKEFILE(dlls/mp3dmod/tests) WINE_CONFIG_MAKEFILE(dlls/mpr) WINE_CONFIG_MAKEFILE(dlls/mpr/tests) WINE_CONFIG_MAKEFILE(dlls/mprapi) diff --git a/dlls/mp3dmod/tests/Makefile.in b/dlls/mp3dmod/tests/Makefile.in new file mode 100644 index 0000000..3cbe4fe --- /dev/null +++ b/dlls/mp3dmod/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = mp3dmod.dll +IMPORTS = dmoguids ole32 strmiids uuid wmcodecdspuuid + +C_SRCS = \ + mp3dmod.c diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c new file mode 100644 index 0000000..966c991 --- /dev/null +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -0,0 +1,233 @@ +/* + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include "windef.h" +#include "wingdi.h" +#include "mmreg.h" +#include "mmsystem.h" +#include "mediaerr.h" +#include "wmcodecdsp.h" +#include "uuids.h" +#include "wine/test.h" + +#include "initguid.h" +DEFINE_GUID(WMMEDIASUBTYPE_MP3, 0x00000055, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); + +/* shorter aliases for flags */ +#define O_SYNCPOINT DMO_OUTPUT_DATA_BUFFERF_SYNCPOINT +#define O_TIME DMO_OUTPUT_DATA_BUFFERF_TIME +#define O_TIMELENGTH DMO_OUTPUT_DATA_BUFFERF_TIMELENGTH +#define O_INCOMPLETE DMO_OUTPUT_DATA_BUFFERF_INCOMPLETE + +struct test_buffer { + IMediaBuffer IMediaBuffer_iface; + BYTE data[5000]; + DWORD len; + DWORD maxlen; +}; + +static inline struct test_buffer *impl_from_IMediaBuffer(IMediaBuffer *iface) +{ + return CONTAINING_RECORD(iface, struct test_buffer, IMediaBuffer_iface); +} + +static HRESULT WINAPI Buffer_QueryInterface(IMediaBuffer *iface, REFIID iid, void **obj) +{ + if (IsEqualIID(iid, &IID_IMediaBuffer) || IsEqualIID(iid, &IID_IUnknown)) + { + *obj = iface; + return S_OK; + } + ok(0, "Unexpected IID %s\n", wine_dbgstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI Buffer_AddRef(IMediaBuffer *iface) +{ + return 2; +} + +static ULONG WINAPI Buffer_Release(IMediaBuffer *iface) +{ + return 1; +} + +static HRESULT WINAPI Buffer_SetLength(IMediaBuffer *iface, DWORD len) +{ + struct test_buffer *This = impl_from_IMediaBuffer(iface); + This->len = len; + return S_OK; +} + +static HRESULT WINAPI Buffer_GetMaxLength(IMediaBuffer *iface, DWORD *len) +{ + struct test_buffer *This = impl_from_IMediaBuffer(iface); + *len = This->maxlen; + return S_OK; +} + +static HRESULT WINAPI Buffer_GetBufferAndLength(IMediaBuffer *iface, BYTE **buf, DWORD *len) +{ + struct test_buffer *This = impl_from_IMediaBuffer(iface); + if (buf) *buf = This->data; + if (len) *len = This->len; + return S_OK; +} + +static IMediaBufferVtbl Buffer_vtbl = { + Buffer_QueryInterface, + Buffer_AddRef, + Buffer_Release, + Buffer_SetLength, + Buffer_GetMaxLength, + Buffer_GetBufferAndLength, +}; + +static void test_convert(void) +{ + static const BYTE mp3hdr[] = {0xff,0xfb,0x14,0xc4}; + struct test_buffer outbuf = {{&Buffer_vtbl}}; + struct test_buffer inbuf = {{&Buffer_vtbl}}; + DMO_MEDIA_TYPE in = {0}, out = {0}; + MPEGLAYER3WAVEFORMAT mp3fmt = {0}; + DMO_OUTPUT_DATA_BUFFER output; + WAVEFORMATEX wavfmt = {0}; + IMediaObject *dmo; + DWORD written; + DWORD status; + HRESULT hr; + int i; + + hr = CoCreateInstance(&CLSID_CMP3DecMediaObject, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaObject, (void **)&dmo); + ok(hr == S_OK, "got %#x\n", hr); + + mp3fmt.wfx.wFormatTag = WAVE_FORMAT_MPEGLAYER3; + mp3fmt.wfx.nChannels = 2; + mp3fmt.wfx.nSamplesPerSec = 48000; + in.majortype = MEDIATYPE_Audio; + in.subtype = WMMEDIASUBTYPE_MP3; + in.formattype = FORMAT_WaveFormatEx; + in.cbFormat = sizeof(mp3fmt); + in.pbFormat = (BYTE *)&mp3fmt; + + hr = IMediaObject_SetInputType(dmo, 0, &in, 0); + ok(hr == S_OK, "got %#x\n", hr); + + wavfmt.wFormatTag = WAVE_FORMAT_PCM; + wavfmt.nChannels = 1; + wavfmt.nSamplesPerSec = 48000; + wavfmt.nAvgBytesPerSec = 48000 * ((1 * 8) / 8); + wavfmt.nBlockAlign = (1 * 8) / 8; + wavfmt.wBitsPerSample = 8; + out.majortype = MEDIATYPE_Audio; + out.subtype = MEDIASUBTYPE_PCM; + out.formattype = FORMAT_WaveFormatEx; + out.cbFormat = sizeof(wavfmt); + out.pbFormat = (BYTE *)&wavfmt; + + hr = IMediaObject_SetOutputType(dmo, 0, &out, 0); + ok(hr == S_OK, "got %#x\n", hr); + + outbuf.len = 0; + outbuf.maxlen = sizeof(outbuf.data); + output.pBuffer = &outbuf.IMediaBuffer_iface; + output.dwStatus = 0xdeadbeef; + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_FALSE, "got %#x\n", hr); + ok(outbuf.len == 0, "got %u\n", outbuf.len); + ok(output.dwStatus == 0, "got %#x\n", output.dwStatus); + + /* write several frames of mp3 data */ + for (i = 0; i < 5; i++) + memcpy(inbuf.data + 96 * i, mp3hdr, 4); + inbuf.len = 96 * 5; + hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); + ok(hr == DMO_E_NOTACCEPTING, "got %#x\n", hr); + + outbuf.len = 0; + outbuf.maxlen = 0; + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_FALSE, "got %#x\n", hr); + ok(outbuf.len == 0, "got %u\n", outbuf.len); + ok(output.dwStatus == (O_SYNCPOINT | O_INCOMPLETE), "got %#x\n", output.dwStatus); + + /* implementations are inconsistent, but should write at least one frame of data */ + outbuf.len = 0; + outbuf.maxlen = 5000; + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_OK, "got %#x\n", hr); + written = outbuf.len; + ok(written > 1152 && written <= 5000, "got %u\n", written); +todo_wine + ok(output.dwStatus == (O_SYNCPOINT | O_TIME | O_TIMELENGTH | O_INCOMPLETE), + "got %#x\n", output.dwStatus); + + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_FALSE, "got %#x\n", hr); + ok(outbuf.len == written, "expected %u, got %u\n", written, outbuf.len); + ok(output.dwStatus == (O_SYNCPOINT | O_INCOMPLETE), "got %#x\n", output.dwStatus); + + hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); + ok(hr == DMO_E_NOTACCEPTING, "got %#x\n", hr); + + /* write the rest */ + outbuf.len = 0; + outbuf.maxlen = 5000; + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_OK, "got %#x\n", hr); + ok(written + outbuf.len == (1152 * 5) || + broken(written + outbuf.len == (1152 * 5) - 528), /* Win10 */ + "got %u, total %u\n", outbuf.len, written + outbuf.len); +todo_wine + ok(output.dwStatus == (O_SYNCPOINT | O_TIME | O_TIMELENGTH), "got %#x\n", output.dwStatus); + + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_FALSE, "got %#x\n", hr); + ok(output.dwStatus == 0, "got %#x\n", output.dwStatus); + + hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); + ok(hr == S_OK, "got %#x\n", hr); + + IMediaObject_Release(dmo); +} + +START_TEST(mp3dmod) +{ + IMediaObject *dmo; + HRESULT hr; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + hr = CoCreateInstance(&CLSID_CMP3DecMediaObject, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaObject, (void **)&dmo); + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip("CLSID_CMP3DecMediaObject not available\n"); + return; + } + IMediaObject_Release(dmo); + + test_convert(); + + CoUninitialize(); +} -- 2.7.4

1 1

[PATCH website] Tighten up URL validation in news plugin
by Kyle Auble 13 May '18

13 May '18

1 0

Wine staging 3.8 release
by Alistair Leslie-Hughes 13 May '18

13 May '18

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 3.8 (920 patches are applied to wine vanilla) * Improve support for some game using the legacy nVidia driver. * Reviewed and upstreamed patches. Fixes * Star Citizen should no longer crash on startup. New Patches * d2d1: Added support for creating ID2D1Bitmap1/ID2D1Factory1/ID2D1DeviceContext interfaces. * d3d11: Stop crash when programs relied on a valid shader instances count. * d3d11: Allow Gauntlet to run using Legacy nVidia driver. * dxgi: Added support for IDXGIDevice2 interface. * wined3d: Implement oMask Support. Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: Oxygen not included, Gauntlet, Giana Sisters * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.com Best Regards Alistair.

1 0

[PATCH] advapi32: Correctly translate SERVICE_REQUIRED_PRIVILEGES_INFO to RPC.
by Zebediah Figura 12 May '18

12 May '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=45179. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/advapi32/service.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index c78edb2..11f4da0 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2448,6 +2448,7 @@ BOOL WINAPI ChangeServiceConfig2A( SC_HANDLE hService, DWORD dwInfoLevel, BOOL WINAPI ChangeServiceConfig2W( SC_HANDLE hService, DWORD dwInfoLevel, LPVOID lpInfo) { + SERVICE_RPC_REQUIRED_PRIVILEGES_INFO rpc_privinfo; DWORD err; __TRY @@ -2455,7 +2456,19 @@ BOOL WINAPI ChangeServiceConfig2W( SC_HANDLE hService, DWORD dwInfoLevel, SC_RPC_CONFIG_INFOW info; info.dwInfoLevel = dwInfoLevel; - info.u.descr = lpInfo; + if (dwInfoLevel == SERVICE_CONFIG_REQUIRED_PRIVILEGES_INFO) + { + SERVICE_REQUIRED_PRIVILEGES_INFOW *privinfo = lpInfo; + WCHAR *p; + + for (p = privinfo->pmszRequiredPrivileges; *p; p += strlenW(p) + 1); + rpc_privinfo.cbRequiredPrivileges = + (p - privinfo->pmszRequiredPrivileges + 1) * sizeof(WCHAR); + rpc_privinfo.pRequiredPrivileges = (BYTE *)privinfo->pmszRequiredPrivileges; + info.u.privinfo = &rpc_privinfo; + } + else + info.u.descr = lpInfo; err = svcctl_ChangeServiceConfig2W( hService, info ); } __EXCEPT(rpc_filter) -- 2.7.4

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 11 May '18

11 May '18

1 0

[PATCH v2 1/6] mp3dmod: Return S_OK from SetInputType().
by Zebediah Figura 11 May '18

11 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/mp3dmod/mp3dmod.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 0f1f069..9592280 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -127,7 +127,7 @@ static HRESULT WINAPI MediaObject_SetInputType(IMediaObject *iface, DWORD index, { FIXME("(%p)->(%d, %p, %#x) stub!\n", iface, index, type, flags); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI MediaObject_SetOutputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) -- 2.7.4

2 8

[PATCH] dsound: Use correct pointer type
by Nikolay Sivov 11 May '18

11 May '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dsound/mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 1180594526..9b3e730961 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -699,7 +699,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) if (!pad_frames) WARN("Probable buffer underrun\n"); - hr = IAudioRenderClient_GetBuffer(device->render, frames, (void*)&buffer); + hr = IAudioRenderClient_GetBuffer(device->render, frames, (BYTE **)&buffer); if(FAILED(hr)){ WARN("GetBuffer failed: %08x\n", hr); LeaveCriticalSection(&device->mixlock); -- 2.17.0

2 1

[PATCH] winmm: Avoid casting unsigned char to plain char.
by Akihiro Sagawa 11 May '18

11 May '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/winmm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH] winmm: Fix default time division value in MIDI stream.
by Akihiro Sagawa 11 May '18

11 May '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 2 +- dlls/winmm/winmm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)

2 1

[PATCH 1/4] gdiplus: Fix a number of transformed points for squared caps.
by Nikolay Sivov 11 May '18

11 May '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdiplus/graphics.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index acee695e9f..6635deac56 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1594,9 +1594,9 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s ptf[3].X = x2 - dbig; ptf[2].X = x2 + dsmall; - gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, ptf, 3); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, ptf, 4); - round_points(pt, ptf, 3); + round_points(pt, ptf, 4); Polygon(graphics->hdc, pt, 4); -- 2.17.0

2 7

[PATCH 9/9] jscript: Added Object.defineProperties stub.
by Jacek Caban 11 May '18

11 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/object.c | 10 ++++++++++ dlls/mshtml/tests/documentmode.js | 1 + 2 files changed, 11 insertions(+)

2 1

[PATCH 8/9] jscript: Use jsdisp_define_property to set prototype constructors.
by Jacek Caban 11 May '18

11 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 5 ----- dlls/jscript/function.c | 3 ++- dlls/jscript/jscript.h | 1 - dlls/mshtml/tests/es5.js | 1 + 4 files changed, 3 insertions(+), 7 deletions(-)

2 1

[PATCH 7/9] jscript: Use jsdisp_define_property to set function prototypes.
by Jacek Caban 11 May '18

11 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/function.c | 12 ++++-------- dlls/mshtml/tests/es5.js | 4 ++++ 2 files changed, 8 insertions(+), 8 deletions(-)

2 1

[PATCH 5/9] jscript: Use jsdisp_define_property for Error object properties.
by Jacek Caban 11 May '18

11 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/error.c | 13 +++++++++---- dlls/mshtml/tests/es5.js | 2 ++ 2 files changed, 11 insertions(+), 4 deletions(-)

2 2

[PATCH 1/6] mp3dmod: Return S_OK from SetInputType().
by Zebediah Figura 11 May '18

11 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/mp3dmod/mp3dmod.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 0f1f069..9592280 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -127,7 +127,7 @@ static HRESULT WINAPI MediaObject_SetInputType(IMediaObject *iface, DWORD index, { FIXME("(%p)->(%d, %p, %#x) stub!\n", iface, index, type, flags); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI MediaObject_SetOutputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) -- 2.7.4

3 9

[PATCH 6/9] jscript: Use jsdisp_define_data_property for arguments object properties.
by Jacek Caban 11 May '18

11 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/function.c | 6 ++++-- dlls/mshtml/tests/es5.js | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-)

2 1

[PATCH 4/9] jscript: Use jsdisp_define_property instead of jsdisp_propput_dontenum for global properties.
by Jacek Caban 11 May '18

11 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/global.c | 58 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 20 deletions(-)

1 0

[PATCH 3/9] jscript: Make global constants non-writable in ES5 mode.
by Jacek Caban 11 May '18

11 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/global.c | 7 ++++--- dlls/mshtml/tests/es5.js | 20 +++++++++++++++++++- 2 files changed, 23 insertions(+), 4 deletions(-)

1 0

[PATCH 2/9] jscript: Use jsdisp_define_property instead of jsdisp_propput_const.
by Jacek Caban 11 May '18

11 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 6 ++++++ dlls/jscript/function.c | 3 ++- dlls/jscript/jscript.h | 2 +- dlls/jscript/math.c | 3 ++- 4 files changed, 11 insertions(+), 3 deletions(-)

1 0

[PATCH 1/9] jscript: Add Object.defineProperty implementation.
by Jacek Caban 11 May '18

11 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 81 +++++++++++++++ dlls/jscript/jscript.h | 11 +++ dlls/jscript/jscript.rc | 4 + dlls/jscript/object.c | 200 +++++++++++++++++++++++++++++++++++++- dlls/jscript/resource.h | 6 ++ dlls/mshtml/tests/documentmode.js | 1 + dlls/mshtml/tests/es5.js | 99 ++++++++++++++++++- dlls/mshtml/tests/winetest.js | 4 + 8 files changed, 400 insertions(+), 6 deletions(-)

1 0

[PATCH] atmlib: add stub for ATMFinish
by Louis Lenders 11 May '18

11 May '18

This fixes a regression in https://bugs.winehq.org/show_bug.cgi?id=45158 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/atmlib/atmlib.spec | 2 +- dlls/atmlib/main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/atmlib/atmlib.spec b/dlls/atmlib/atmlib.spec index 387486dd4d..dc55548b1f 100644 --- a/dlls/atmlib/atmlib.spec +++ b/dlls/atmlib/atmlib.spec @@ -16,7 +16,7 @@ @ stub ATMEnumMMFonts @ stub ATMEnumMMFontsA @ stub ATMEnumMMFontsW -@ stub ATMFinish +@ stdcall ATMFinish() @ stub ATMFontAvailable @ stub ATMFontAvailableA @ stub ATMFontAvailableW diff --git a/dlls/atmlib/main.c b/dlls/atmlib/main.c index 0baca0001e..efae51f409 100644 --- a/dlls/atmlib/main.c +++ b/dlls/atmlib/main.c @@ -45,3 +45,9 @@ BOOL WINAPI ATMProperlyLoaded(void) FIXME("stub\n"); return FALSE; } + +int WINAPI ATMFinish(void) +{ + FIXME("stub\n"); + return 0; +} -- 2.17.0

1 0

[PATCH 2/2] mstask: Export the AT Service RPC API. (resend)
by Dmitry Timoshkov 11 May '18

11 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/Makefile.in | 3 ++- dlls/mstask/atsvc.idl | 21 +++++++++++++++++++++ dlls/mstask/mstask.spec | 16 ++++++++-------- dlls/mstask/mstask_main.c | 30 ++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 9 deletions(-) create mode 100644 dlls/mstask/atsvc.idl diff --git a/dlls/mstask/Makefile.in b/dlls/mstask/Makefile.in index d914666eed..086d3c0c5a 100644 --- a/dlls/mstask/Makefile.in +++ b/dlls/mstask/Makefile.in @@ -1,5 +1,5 @@ MODULE = mstask.dll -IMPORTS = ole32 oleaut32 +IMPORTS = rpcrt4 ole32 oleaut32 C_SRCS = \ factory.c \ @@ -9,4 +9,5 @@ C_SRCS = \ task_trigger.c IDL_SRCS = \ + atsvc.idl \ mstask_local.idl diff --git a/dlls/mstask/atsvc.idl b/dlls/mstask/atsvc.idl new file mode 100644 index 0000000000..b5a2cee0e9 --- /dev/null +++ b/dlls/mstask/atsvc.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2018 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep client + +#include "wine/atsvc.idl" diff --git a/dlls/mstask/mstask.spec b/dlls/mstask/mstask.spec index 0b6c23b79d..dcfb20cab3 100644 --- a/dlls/mstask/mstask.spec +++ b/dlls/mstask/mstask.spec @@ -2,10 +2,10 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub GetNetScheduleAccountInformation -@ stub NetrJobAdd -@ stub NetrJobDel -@ stub NetrJobEnum -@ stub NetrJobGetInfo +@ stdcall NetrJobAdd(wstr ptr ptr) +@ stdcall NetrJobDel(wstr long long) +@ stdcall NetrJobEnum(wstr ptr long ptr ptr) +@ stdcall NetrJobGetInfo(wstr long ptr) @ stub SAGetAccountInformation @ stub SAGetNSAccountInformation @ stub SASetAccountInformation @@ -15,10 +15,10 @@ @ stub _DllCanUnloadNow@0 @ stub _DllGetClassObject@12 @ stub _GetNetScheduleAccountInformation@12 -@ stub _NetrJobAdd@12 -@ stub _NetrJobDel@12 -@ stub _NetrJobEnum@20 -@ stub _NetrJobGetInfo@12 +@ stdcall _NetrJobAdd@12(wstr ptr ptr) NetrJobAdd +@ stdcall _NetrJobDel@12(wstr long long) NetrJobDel +@ stdcall _NetrJobEnum@20(wstr ptr long ptr ptr) NetrJobEnum +@ stdcall _NetrJobGetInfo@12(wstr long ptr) NetrJobGetInfo @ stub _SAGetAccountInformation@16 @ stub _SAGetNSAccountInformation@12 @ stub _SASetAccountInformation@20 diff --git a/dlls/mstask/mstask_main.c b/dlls/mstask/mstask_main.c index eae85562f5..c1e9036819 100644 --- a/dlls/mstask/mstask_main.c +++ b/dlls/mstask/mstask_main.c @@ -27,6 +27,7 @@ #include "taskschd.h" #include "mstask.h" #include "mstask_private.h" +#include "atsvc.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mstask); @@ -77,3 +78,32 @@ HRESULT WINAPI DllUnregisterServer(void) { return __wine_unregister_resources( hInst ); } + +DECLSPEC_HIDDEN void __RPC_FAR *__RPC_USER MIDL_user_allocate(SIZE_T n) +{ + return HeapAlloc(GetProcessHeap(), 0, n); +} + +DECLSPEC_HIDDEN void __RPC_USER MIDL_user_free(void __RPC_FAR *p) +{ + HeapFree(GetProcessHeap(), 0, p); +} + +DECLSPEC_HIDDEN handle_t __RPC_USER ATSVC_HANDLE_bind(ATSVC_HANDLE str) +{ + static unsigned char ncalrpc[] = "ncalrpc"; + unsigned char *binding_str; + handle_t rpc_handle = 0; + + if (RpcStringBindingComposeA(NULL, ncalrpc, NULL, NULL, NULL, &binding_str) == RPC_S_OK) + { + RpcBindingFromStringBindingA(binding_str, &rpc_handle); + RpcStringFreeA(&binding_str); + } + return rpc_handle; +} + +DECLSPEC_HIDDEN void __RPC_USER ATSVC_HANDLE_unbind(ATSVC_HANDLE ServerName, handle_t rpc_handle) +{ + RpcBindingFree(&rpc_handle); +} -- 2.16.3

2 2

[PATCH] mstask: Add stdcall to cdecl thunks for AT Service RPC API.
by Dmitry Timoshkov 11 May '18

11 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/mstask.spec | 16 ++++++++-------- dlls/mstask/mstask_main.c | 21 +++++++++++++++++++++ 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/mstask/mstask.spec b/dlls/mstask/mstask.spec index dcfb20cab3..df8ea7ad78 100644 --- a/dlls/mstask/mstask.spec +++ b/dlls/mstask/mstask.spec @@ -2,10 +2,10 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub GetNetScheduleAccountInformation -@ stdcall NetrJobAdd(wstr ptr ptr) -@ stdcall NetrJobDel(wstr long long) -@ stdcall NetrJobEnum(wstr ptr long ptr ptr) -@ stdcall NetrJobGetInfo(wstr long ptr) +@ stdcall NetrJobAdd(wstr ptr ptr) NetrJobAdd_wrapper +@ stdcall NetrJobDel(wstr long long) NetrJobDel_wrapper +@ stdcall NetrJobEnum(wstr ptr long ptr ptr) NetrJobEnum_wrapper +@ stdcall NetrJobGetInfo(wstr long ptr) NetrJobGetInfo_wrapper @ stub SAGetAccountInformation @ stub SAGetNSAccountInformation @ stub SASetAccountInformation @@ -15,10 +15,10 @@ @ stub _DllCanUnloadNow@0 @ stub _DllGetClassObject@12 @ stub _GetNetScheduleAccountInformation@12 -@ stdcall _NetrJobAdd@12(wstr ptr ptr) NetrJobAdd -@ stdcall _NetrJobDel@12(wstr long long) NetrJobDel -@ stdcall _NetrJobEnum@20(wstr ptr long ptr ptr) NetrJobEnum -@ stdcall _NetrJobGetInfo@12(wstr long ptr) NetrJobGetInfo +@ stdcall _NetrJobAdd@12(wstr ptr ptr) NetrJobAdd_wrapper +@ stdcall _NetrJobDel@12(wstr long long) NetrJobDel_wrapper +@ stdcall _NetrJobEnum@20(wstr ptr long ptr ptr) NetrJobEnum_wrapper +@ stdcall _NetrJobGetInfo@12(wstr long ptr) NetrJobGetInfo_wrapper @ stub _SAGetAccountInformation@16 @ stub _SAGetNSAccountInformation@12 @ stub _SASetAccountInformation@20 diff --git a/dlls/mstask/mstask_main.c b/dlls/mstask/mstask_main.c index c1e9036819..e747af69e8 100644 --- a/dlls/mstask/mstask_main.c +++ b/dlls/mstask/mstask_main.c @@ -79,6 +79,27 @@ HRESULT WINAPI DllUnregisterServer(void) return __wine_unregister_resources( hInst ); } +DWORD WINAPI NetrJobAdd_wrapper(ATSVC_HANDLE server_name, LPAT_INFO info, LPDWORD jobid) +{ + return NetrJobAdd(server_name, info, jobid); +} + +DWORD WINAPI NetrJobDel_wrapper(ATSVC_HANDLE server_name, DWORD min_jobid, DWORD max_jobid) +{ + return NetrJobDel(server_name, min_jobid, max_jobid); +} + +DWORD WINAPI NetrJobEnum_wrapper(ATSVC_HANDLE server_name, LPAT_ENUM_CONTAINER container, + DWORD max_length, LPDWORD total, LPDWORD resume) +{ + return NetrJobEnum(server_name, container, max_length, total, resume); +} + +DWORD WINAPI NetrJobGetInfo_wrapper(ATSVC_HANDLE server_name, DWORD jobid, LPAT_INFO *info) +{ + return NetrJobGetInfo(server_name, jobid, info); +} + DECLSPEC_HIDDEN void __RPC_FAR *__RPC_USER MIDL_user_allocate(SIZE_T n) { return HeapAlloc(GetProcessHeap(), 0, n); -- 2.16.3

1 0

[PATCH 1/2] ntdll: Implement NtCreateToken.
by Hans Leidekker 11 May '18

11 May '18

v2: Validate request data. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ntdll/nt.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 +- server/protocol.def | 15 ++++++ server/token.c | 119 +++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 258 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index c3f5df337f..29fff96036 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -70,6 +70,135 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); * Token */ +static BOOL get_primary_group_index( const TOKEN_PRIMARY_GROUP *primary, const TOKEN_GROUPS *groups, + unsigned int *index ) +{ + unsigned int i; + for (i = 0; i < groups->GroupCount; i++) + { + if (RtlEqualSid( primary->PrimaryGroup, groups->Groups[i].Sid )) + { + *index = i + 1; /* 0 is reserved for user */ + return TRUE; + } + } + return FALSE; +} + +static BOOL get_owner_index( const TOKEN_OWNER *owner, const TOKEN_USER *user, const TOKEN_GROUPS *groups, + unsigned int *index ) +{ + unsigned int i; + if (RtlEqualSid( owner->Owner, user->User.Sid )) + { + *index = 0; + return TRUE; + } + for (i = 0; i < groups->GroupCount; i++) + { + if (RtlEqualSid( owner->Owner, groups->Groups[i].Sid )) + { + *index = i + 1; + return TRUE; + } + } + return FALSE; +} + +/* create flat groups buffer and store user as first entry */ +static struct token_groups *flatten_groups( const TOKEN_USER *user, const TOKEN_GROUPS *groups, data_size_t *size ) +{ + struct token_groups *ret; + unsigned int i, sid_len, *attr; + char *sid; + + *size = sizeof(*ret) + sizeof(*attr) + RtlLengthSid( user->User.Sid ); + for (i = 0; i < groups->GroupCount; i++) + { + *size += sizeof(*attr); + *size += RtlLengthSid( groups->Groups[i].Sid ); + } + + if (!(ret = RtlAllocateHeap( GetProcessHeap(), 0, *size ))) return NULL; + attr = (unsigned int *)(ret + 1); + sid = (char *)attr + (groups->GroupCount + 1) * sizeof(*attr); + + *attr++ = user->User.Attributes; + sid_len = RtlLengthSid( user->User.Sid ); + memcpy( sid, user->User.Sid, sid_len ); + sid += sid_len; + + for (i = 0; i < groups->GroupCount; i++) + { + *attr++ = groups->Groups[i].Attributes; + sid_len = RtlLengthSid( groups->Groups[i].Sid ); + memcpy( sid, groups->Groups[i].Sid, sid_len ); + sid += sid_len; + } + + ret->count = groups->GroupCount + 1; + return ret; +} + +static unsigned int acl_size( const ACL *acl ) +{ + unsigned int i, ret = sizeof(*acl); + ACE_HEADER *ace = (ACE_HEADER *)(acl + 1); + if (!acl) return 0; + for (i = 0; i < acl->AceCount; i++) ret += ace[i].AceSize; + return ret; +} + +NTSTATUS WINAPI NtCreateToken( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attrs, TOKEN_TYPE type, + LUID *session, LARGE_INTEGER *expiration, TOKEN_USER *user, TOKEN_GROUPS *groups, + TOKEN_PRIVILEGES *privs, TOKEN_OWNER *owner, TOKEN_PRIMARY_GROUP *primary_group, + TOKEN_DEFAULT_DACL *dacl, TOKEN_SOURCE *source ) +{ + NTSTATUS status; + struct object_attributes *objattr; + struct token_groups *flat_groups; + data_size_t attr_size, flat_groups_size, default_dacl_size = dacl ? acl_size( dacl->DefaultDacl ) : 0; + ACL *default_dacl = dacl ? dacl->DefaultDacl : NULL; + unsigned int primary_group_index, owner_index; + + TRACE( "(%p,%08x,%s,%u,%p,%p,%p,%p,%p,%p,%p,%p,%p)\n", handle, access, debugstr_ObjectAttributes(attrs), + type, session, expiration, user, groups, privs, owner, primary_group, dacl, source ); + + if (!handle || !session || !expiration || !user || !groups || !privs || !owner || !primary_group || !source) + return STATUS_ACCESS_VIOLATION; + + if (!get_primary_group_index( primary_group, groups, &primary_group_index )) return STATUS_INVALID_PRIMARY_GROUP; + if (!get_owner_index( owner, user, groups, &owner_index )) return STATUS_INVALID_OWNER; + + if (!(flat_groups = flatten_groups( user, groups, &flat_groups_size ))) return STATUS_NO_MEMORY; + if ((status = alloc_object_attributes( attrs, &objattr, &attr_size ))) + { + RtlFreeHeap( GetProcessHeap(), 0, flat_groups ); + return status; + } + + SERVER_START_REQ( create_token ) + { + req->access = access; + req->primary = (type == TokenPrimary); + req->primary_group_index = primary_group_index; + req->owner_index = owner_index; + req->privilege_count = privs->PrivilegeCount; + req->default_dacl_size = default_dacl_size; + wine_server_add_data( req, objattr, attr_size ); + wine_server_add_data( req, privs->Privileges, privs->PrivilegeCount * sizeof(privs->Privileges[0]) ); + wine_server_add_data( req, default_dacl, default_dacl_size ); + wine_server_add_data( req, flat_groups, flat_groups_size ); + status = wine_server_call( req ); + if (!status) *handle = wine_server_ptr_handle( reply->token ); + } + SERVER_END_REQ; + + RtlFreeHeap( GetProcessHeap(), 0, flat_groups ); + RtlFreeHeap( GetProcessHeap(), 0, objattr ); + return status; +} + /****************************************************************************** * NtDuplicateToken [NTDLL.@] * ZwDuplicateToken [NTDLL.@] diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c260b0dbec..27e51a165b 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -154,7 +154,7 @@ @ stub NtCreateThread @ stdcall NtCreateThreadEx(ptr long ptr long ptr ptr long long long long ptr) @ stdcall NtCreateTimer(ptr long ptr long) -@ stub NtCreateToken +@ stdcall NtCreateToken(ptr long ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr ) # @ stub NtCreateWaitablePort @ stdcall -arch=win32,arm64 NtCurrentTeb() # @ stub NtDebugActiveProcess diff --git a/server/protocol.def b/server/protocol.def index 35824ae952..3dae8ab521 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3286,6 +3286,21 @@ enum caret_state user_handle_t window; /* clipboard listener window */ @END +/* Create a security token */ +@REQ(create_token) + unsigned int access; /* access rights to the new token */ + int primary; /* is the new token to be a primary one? */ + unsigned int primary_group_index; /* primary group index into groups array */ + unsigned int owner_index; /* owner index into groups array */ + unsigned int privilege_count; /* number of privileges */ + unsigned int default_dacl_size; /* size of default dacl */ + VARARG(objattr,object_attributes); /* object attributes */ + VARARG(default_dacl,ACL); /* token default dacl */ + VARARG(privileges,LUID_AND_ATTRIBUTES); /* token privileges */ + VARARG(groups,token_groups); /* token groups, first element is token user */ +@REPLY + obj_handle_t token; /* handle to the token */ +@END /* Open a security token */ @REQ(open_token) diff --git a/server/token.c b/server/token.c index 0810a61353..172a3414ab 100644 --- a/server/token.c +++ b/server/token.c @@ -221,6 +221,11 @@ const SID *security_unix_uid_to_sid( uid_t uid ) return &anonymous_logon_sid; } +static inline int sid_is_valid( const SID *sid, data_size_t size ) +{ + return (size >= FIELD_OFFSET( SID, SubAuthority[0] ) && size >= security_sid_len( sid )); +} + static int acl_is_valid( const ACL *acl, data_size_t size ) { ULONG i; @@ -269,8 +274,7 @@ static int acl_is_valid( const ACL *acl, data_size_t size ) default: return FALSE; } - if (sid_size < FIELD_OFFSET(SID, SubAuthority[0]) || sid_size < security_sid_len( sid )) - return FALSE; + if (!sid_is_valid( sid, sid_size )) return FALSE; ace = ace_next( ace ); } return TRUE; @@ -326,7 +330,6 @@ int sd_is_valid( const struct security_descriptor *sd, data_size_t size ) dacl = sd_get_dacl( sd, &dummy ); if (dacl && !acl_is_valid( dacl, sd->dacl_len )) return FALSE; - offset += sd->dacl_len; return TRUE; } @@ -527,7 +530,7 @@ static void token_destroy( struct object *obj ) * modified_id may be NULL, indicating that a new modified_id luid should be * allocated. */ -static struct token *create_token( unsigned primary, const SID *user, +static struct token *token_create( unsigned primary, const SID *user, const SID_AND_ATTRIBUTES *groups, unsigned int group_count, const LUID_AND_ATTRIBUTES *privs, unsigned int priv_count, const ACL *default_dacl, TOKEN_SOURCE source, @@ -638,7 +641,7 @@ struct token *token_duplicate( struct token *src_token, unsigned primary, return NULL; } - token = create_token( primary, src_token->user, NULL, 0, + token = token_create( primary, src_token->user, NULL, 0, NULL, 0, src_token->default_dacl, src_token->source, modified_id, impersonation_level ); @@ -836,7 +839,7 @@ struct token *token_create_admin( void ) { logon_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_LOGON_ID }, }; static const TOKEN_SOURCE admin_source = {"SeMgr", {0, 0}}; - token = create_token( TRUE, user_sid, admin_groups, sizeof(admin_groups)/sizeof(admin_groups[0]), + token = token_create( TRUE, user_sid, admin_groups, sizeof(admin_groups)/sizeof(admin_groups[0]), admin_privs, sizeof(admin_privs)/sizeof(admin_privs[0]), default_dacl, admin_source, NULL, -1 ); /* we really need a primary group */ @@ -1173,6 +1176,110 @@ int check_object_access(struct object *obj, unsigned int *access) return res; } +/* create a security token */ +DECL_HANDLER(create_token) +{ + static const TOKEN_SOURCE source = {"SeMgr", {0, 0}}; + struct token *token; + struct unicode_str name; + const struct security_descriptor *sd; + const struct object_attributes *objattr = get_req_object_attributes( &sd, &name, NULL ); + data_size_t data_size, privs_size; + const LUID_AND_ATTRIBUTES *privs; + const ACL *acl = NULL; + ACL *default_dacl = NULL; + const struct token_groups *groups; + const unsigned int *attr; + unsigned int i; + const SID *sid; + + if (!objattr) return; + + privs = get_req_data_after_objattr( objattr, &data_size ); + privs_size = req->privilege_count * sizeof(*privs); + if (privs_size > data_size) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + data_size -= privs_size; + + if (req->default_dacl_size) + { + acl = (const ACL *)((const char *)privs + privs_size); + if (!acl_is_valid( acl, req->default_dacl_size )) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + } + data_size -= req->default_dacl_size; + + groups = (const struct token_groups *)((const char *)privs + privs_size + req->default_dacl_size); + if (data_size < sizeof(*groups) || !groups->count || + sizeof(*groups) + groups->count * sizeof(*attr) > data_size || + req->primary_group_index < 1 || req->primary_group_index >= groups->count || + req->owner_index >= groups->count) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + attr = (const unsigned int *)(groups + 1); + data_size -= sizeof(*groups) + groups->count * sizeof(*attr); + + sid = (const SID *)(attr + groups->count); + for (i = 0; i < groups->count; i++) + { + if (!sid_is_valid( sid, data_size )) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + data_size -= security_sid_len( sid ); + sid = (const SID *)((const char *)sid + security_sid_len( sid )); + } + + if (!acl) acl = default_dacl = create_default_dacl( sid ); + sid = (const SID *)(attr + groups->count); /* first entry is user */ + + if ((token = token_create( req->primary, sid, NULL, 0, privs, req->privilege_count, acl, source, NULL, + SecurityIdentification ))) + { + sid = (const SID *)((const char *)sid + security_sid_len( sid )); /* skip user */ + attr++; + for (i = 1; i < groups->count; i++) + { + struct group *group; + if (!(group = mem_alloc( FIELD_OFFSET(struct group, sid.SubAuthority[sid->SubAuthorityCount]) ))) + { + release_object( token ); + return; + } + + memcpy( &group->sid, sid, security_sid_len( sid ) ); + group->enabled = (*attr & SE_GROUP_ENABLED) != 0; + group->def = (*attr & SE_GROUP_ENABLED_BY_DEFAULT) != 0; + group->logon = (*attr & SE_GROUP_LOGON_ID) != 0; + group->mandatory = (*attr & SE_GROUP_MANDATORY) != 0; + group->owner = (*attr & SE_GROUP_OWNER) != 0; + group->resource = (*attr & SE_GROUP_RESOURCE) != 0; + group->deny_only = (*attr & SE_GROUP_USE_FOR_DENY_ONLY) != 0; + list_add_tail( &token->groups, &group->entry ); + + if (req->primary_group_index == i) token->primary_group = &group->sid; + if (req->owner_index == i) token->owner = &group->sid; + + sid = (const SID *)((const char *)sid + security_sid_len( sid )); + attr++; + } + if (!req->owner_index) token->owner = token->user; + + reply->token = alloc_handle( current->process, token, req->access, objattr->attributes ); + release_object( token ); + } + + free( default_dacl ); +} /* open a security token */ DECL_HANDLER(open_token) -- 2.11.0

2 1

[PATCH] shell32: Choose return value for SHFileOperationW depending on windows version
by Alistair Leslie-Hughes 11 May '18

11 May '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shlfileop.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 4507b72..244b34b 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1019,7 +1019,7 @@ static HRESULT parse_file_list(FILE_LIST *flList, LPCWSTR szFiles) /* empty list */ if (!szFiles[0]) - return ERROR_ACCESS_DENIED; + return ERROR_ACCESS_DENIED; /* S_OK for Windows 95/98 */ flList->feFiles = heap_alloc_zero(flList->num_alloc * sizeof(FILE_ENTRY)); @@ -1525,7 +1525,19 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp) ZeroMemory(&flTo, sizeof(FILE_LIST)); if ((ret = parse_file_list(&flFrom, lpFileOp->pFrom))) + { + if (ret != ERROR_ACCESS_DENIED) + return ret; + + /* Windows 95/98 */ + if (GetVersion() & 0x80000000) + return S_OK; + + WARN("The return value of this function call depends on the windows version.\n"); + WARN("For older software it might be necessary to set the windows version to 95/98 using winecfg.\n"); + return ret; + } if (lpFileOp->wFunc != FO_DELETE) parse_file_list(&flTo, lpFileOp->pTo); -- 1.9.1

2 1

[PATCH 11/12] mstask/tests: Add some tests for ITask::Run().
by Dmitry Timoshkov 11 May '18

11 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/tests/task.c | 164 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 6837782f2a..2e8ee93630 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -591,6 +591,169 @@ static void test_task_state(void) cleanup_task(); } +static void save_job(ITask *task) +{ + HRESULT hr; + IPersistFile *pfile; + + hr = ITask_QueryInterface(task, &IID_IPersistFile, (void **)&pfile); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + hr = IPersistFile_Save(pfile, NULL, FALSE); + ok(hr == S_OK, "got %#x\n", hr); + + IPersistFile_Release(pfile); +} + +static void test_Run(void) +{ + static const WCHAR wine_test_runW[] = { 'w','i','n','e','_','t','e','s','t','_','r','u','n',0 }; + static const WCHAR cmdW[] = { 'c','m','d','.','e','x','e',0 }; + ITaskScheduler *scheduler; + ITask *task; + ITaskTrigger *trigger; + WORD idx, i; + TASK_TRIGGER trigger_data; + SYSTEMTIME st; + HRESULT hr, status; + + hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, + &IID_ITaskScheduler, (void **)&scheduler); + ok(hr == S_OK, "got %#x\n", hr); + + /* cleanup after previous runs */ + ITaskScheduler_Delete(scheduler, wine_test_runW); + + hr = ITaskScheduler_NewWorkItem(scheduler, wine_test_runW, &CLSID_CTask, + &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "got %#x\n", hr); + + hr = ITask_Run(task); + ok(hr == SCHED_E_TASK_NOT_READY, "got %#x\n", hr); + + hr = ITask_Terminate(task); + ok(hr == SCHED_E_TASK_NOT_RUNNING, "got %#x\n", hr); + + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + ok(status == SCHED_S_TASK_NOT_SCHEDULED, "got %#x\n", status); + + save_job(task); + + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + ok(status == SCHED_S_TASK_NOT_SCHEDULED, "got %#x\n", status); + + hr = ITask_CreateTrigger(task, &idx, &trigger); + ok(hr == S_OK, "got %#x\n", hr); + + memset(&trigger_data, 0, sizeof(trigger_data)); + trigger_data.cbTriggerSize = sizeof(trigger_data); + trigger_data.Reserved1 = 0; + GetLocalTime(&st); + trigger_data.wBeginYear = st.wYear; + trigger_data.wBeginMonth = st.wMonth; + trigger_data.wBeginDay = st.wDay; + trigger_data.wStartHour = st.wHour; + trigger_data.wStartMinute = st.wMinute; + trigger_data.TriggerType = TASK_TIME_TRIGGER_WEEKLY; + trigger_data.Type.Weekly.WeeksInterval = 1; + trigger_data.Type.Weekly.rgfDaysOfTheWeek = 0x7f; /* every day */ + hr = ITaskTrigger_SetTrigger(trigger, &trigger_data); + ok(hr == S_OK, "got %#x\n", hr); + ITaskTrigger_Release(trigger); + + hr = ITask_SetApplicationName(task, cmdW); + ok(hr == S_OK, "got %#x\n", hr); + + hr = ITask_SetParameters(task, empty); + ok(hr == S_OK, "got %#x\n", hr); + + hr = ITask_SetWorkingDirectory(task, empty); + ok(hr == S_OK, "got %#x\n", hr); + + /* Save the task so that the Scheduler service would notice the changes */ + save_job(task); + + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + ok(status == SCHED_S_TASK_HAS_NOT_RUN, "got %#x\n", status); + + hr = ITask_Run(task); + ok(hr == S_OK, "got %#x\n", hr); + + /* According to MSDN the task status doesn't update dynamically */ + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + ok(status == SCHED_S_TASK_HAS_NOT_RUN, "got %#x\n", status); + + ITask_Release(task); + + /* Running the process associated with the task to start up may + * take quite a bit a of time, and waiting for it during the test + * may be not the best idea. + * + * This is how it's supposed to look like in the application + * (the loop should be infinite): + */ + for (i = 0; i < 3; i++) + { + hr = ITaskScheduler_Activate(scheduler, wine_test_runW, &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "Activate error %#x\n", hr); + + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + + ITask_Release(task); + + if (status == SCHED_S_TASK_RUNNING) break; + + Sleep(100); + } + + hr = ITaskScheduler_Activate(scheduler, wine_test_runW, &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "Activate error %#x\n", hr); + + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + + if (status == SCHED_S_TASK_RUNNING) + { + hr = ITask_Terminate(task); + ok(hr == S_OK, "got %#x\n", hr); + + ITask_Release(task); + + /* Waiting for the process associated with the task to terminate + * may take quite a bit a of time, and waiting for it during the + * test is not practical. + * + * This is how it's supposed to look like in the application + * (the loop should be infinite): + */ + for (i = 0; i < 3; i++) + { + hr = ITaskScheduler_Activate(scheduler, wine_test_runW, &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "Activate error %#x\n", hr); + + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + + ITask_Release(task); + + if (status != SCHED_S_TASK_RUNNING) break; + + Sleep(100); + } + } + else + ITask_Release(task); + + hr = ITaskScheduler_Delete(scheduler, wine_test_runW); + ok(hr == S_OK, "got %#x\n", hr); + ITaskScheduler_Release(scheduler); +} + START_TEST(task) { CoInitialize(NULL); @@ -601,5 +764,6 @@ START_TEST(task) test_SetMaxRunTime_GetMaxRunTime(); test_SetAccountInformation_GetAccountInformation(); test_task_state(); + test_Run(); CoUninitialize(); } -- 2.16.3

2 3

[PATCH] server: Map EXDEV to STATUS_NOT_SAME_DEVICE.
by Alistair Leslie-Hughes 11 May '18

11 May '18

From: Qian Hong <qhong(a)codeweavers.com> SMB Reference document (look for STATUS_NOT_SAME_DEVICE). https://msdn.microsoft.com/en-us/library/ee441884.aspx Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- server/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/file.c b/server/file.c index 390b072..446621a 100644 --- a/server/file.c +++ b/server/file.c @@ -671,6 +671,7 @@ void file_set_error(void) case EFBIG: set_error( STATUS_SECTION_TOO_BIG ); break; case ENODEV: set_error( STATUS_NO_SUCH_DEVICE ); break; case ENXIO: set_error( STATUS_NO_SUCH_DEVICE ); break; + case EXDEV: set_error( STATUS_NOT_SAME_DEVICE ); break; #ifdef EOVERFLOW case EOVERFLOW: set_error( STATUS_INVALID_PARAMETER ); break; #endif -- 1.9.1

1 0

[PATCH 12/12] schedsvc: Read more task fields from the job file.
by Dmitry Timoshkov 11 May '18

11 May '18

Print a FIXME() when the service detects a client action. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index cb9bc1fe98..542dfc3701 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -60,6 +60,8 @@ struct job_t struct list entry; WCHAR *name; AT_ENUM info; + FIXDLEN_DATA data; + USHORT instance_count; }; static LONG current_jobid = 1; @@ -109,13 +111,12 @@ static DWORD load_unicode_strings(const char *data, DWORD limit, AT_ENUM *info) return data_size; } -/* FIXME: read more data, currently only Command is handled */ -static BOOL load_job_data(const char *data, DWORD size, AT_ENUM *info) +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 instance_count, triggers_count, i; + USHORT triggers_count, i; const USHORT *signature; const TASK_TRIGGER *trigger; @@ -128,6 +129,7 @@ static BOOL load_job_data(const char *data, DWORD size, AT_ENUM *info) } fixed = (const FIXDLEN_DATA *)data; + info->data = *fixed; TRACE("product_version %04x\n", fixed->product_version); TRACE("file_version %04x\n", fixed->file_version); @@ -156,11 +158,11 @@ static BOOL load_job_data(const char *data, DWORD size, AT_ENUM *info) return FALSE; } - instance_count = *(const USHORT *)(data + sizeof(*fixed)); - TRACE("instance count %u\n", instance_count); + info->instance_count = *(const USHORT *)(data + sizeof(*fixed)); + TRACE("instance count %u\n", info->instance_count); if (fixed->name_size_offset + sizeof(USHORT) < size) - unicode_strings_size = load_unicode_strings(data + fixed->name_size_offset, size - fixed->name_size_offset, info); + unicode_strings_size = load_unicode_strings(data + fixed->name_size_offset, size - fixed->name_size_offset, &info->info); else { TRACE("invalid name_size_offset\n"); @@ -269,7 +271,7 @@ static BOOL load_job_data(const char *data, DWORD size, AT_ENUM *info) return TRUE; } -static BOOL load_job(const WCHAR *name, AT_ENUM *info) +static BOOL load_job(const WCHAR *name, struct job_t *info) { HANDLE file, mapping; DWORD size, try; @@ -332,12 +334,17 @@ void add_job(const WCHAR *name) job = heap_alloc_zero(sizeof(*job)); if (!job) return; - if (!load_job(name, &job->info)) + if (!load_job(name, job)) { free_job(job); return; } + if (job->data.flags & 0x08000000) + FIXME("Terminate(%s): not implemented\n", debugstr_w(job->info.Command)); + else if (job->data.flags & 0x04000000) + FIXME("Run(%s): not implemented\n", debugstr_w(job->info.Command)); + EnterCriticalSection(&at_job_list_section); job->name = heap_strdupW(name); job->info.JobId = current_jobid++; -- 2.16.3

1 0

[PATCH 10/12] mstask: Implement ITask::Terminate().
by Dmitry Timoshkov 11 May '18

11 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index fa84f4e9ed..9cdf92e319 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -283,11 +283,17 @@ static HRESULT WINAPI MSTASK_ITask_Run(ITask *iface) return IPersistFile_Save(&This->IPersistFile_iface, NULL, FALSE); } -static HRESULT WINAPI MSTASK_ITask_Terminate( - ITask* iface) +static HRESULT WINAPI MSTASK_ITask_Terminate(ITask *iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p)\n", iface); + + if (!This->instance_count) + return SCHED_E_TASK_NOT_RUNNING; + + This->flags |= 0x08000000; + return IPersistFile_Save(&This->IPersistFile_iface, NULL, FALSE); } static HRESULT WINAPI MSTASK_ITask_EditWorkItem( -- 2.16.3

1 0

2025

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