winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
April 2018
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
542 discussions
Start a n
N
ew thread
Dmitry Timoshkov : mstask: Implement ITask::GetTrigger().
by Alexandre Julliard
24 Apr '18
24 Apr '18
Module: wine Branch: master Commit: 0ad429aff6fc24230decb99bd3334f65d9a15e73 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=0ad429aff6fc24230decb99b…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 24 16:13:58 2018 +0800 mstask: Implement ITask::GetTrigger(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 2525a1a..8c9d479 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -198,13 +198,24 @@ static HRESULT WINAPI MSTASK_ITask_GetTriggerCount(ITask *iface, WORD *count) return S_OK; } -static HRESULT WINAPI MSTASK_ITask_GetTrigger( - ITask* iface, - WORD iTrigger, - ITaskTrigger **ppTrigger) +static HRESULT WINAPI MSTASK_ITask_GetTrigger(ITask *iface, WORD idx, ITaskTrigger **trigger) { - FIXME("(%p, %d, %p): stub\n", iface, iTrigger, ppTrigger); - return E_NOTIMPL; + 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; } static HRESULT WINAPI MSTASK_ITask_GetTriggerString(
1
0
0
0
Dmitry Timoshkov : mstask: Implement ITask::DeleteTrigger().
by Alexandre Julliard
24 Apr '18
24 Apr '18
Module: wine Branch: master Commit: 0049deca7a1146b5ba88fd3947d4c9ee03d57887 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=0049deca7a1146b5ba88fd39…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 24 16:13:51 2018 +0800 mstask: Implement ITask::DeleteTrigger(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 199049d..2525a1a 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -171,12 +171,21 @@ static HRESULT WINAPI MSTASK_ITask_CreateTrigger(ITask *iface, WORD *idx, ITaskT return hr; } -static HRESULT WINAPI MSTASK_ITask_DeleteTrigger( - ITask* iface, - WORD iTrigger) +static HRESULT WINAPI MSTASK_ITask_DeleteTrigger(ITask *iface, WORD idx) { - FIXME("(%p, %d): stub\n", iface, iTrigger); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p, %u)\n", iface, idx); + + if (idx >= This->trigger_count) + return SCHED_E_TRIGGER_NOT_FOUND; + + This->trigger_count--; + memmove(&This->trigger[idx], &This->trigger[idx + 1], (This->trigger_count - idx) * sizeof(This->trigger[0])); + /* this shouldn't fail in practice since we're shrinking the memory block */ + This->trigger = heap_realloc(This->trigger, sizeof(This->trigger[0]) * This->trigger_count); + + return S_OK; } static HRESULT WINAPI MSTASK_ITask_GetTriggerCount(ITask *iface, WORD *count)
1
0
0
0
Dmitry Timoshkov : mstask: Implement ITask::CreateTrigger().
by Alexandre Julliard
24 Apr '18
24 Apr '18
Module: wine Branch: master Commit: bcb50e2d12f8f13f020226a312ebd288152b9f1e URL:
https://source.winehq.org/git/wine.git/?a=commit;h=bcb50e2d12f8f13f020226a3…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 24 16:13:47 2018 +0800 mstask: Implement ITask::CreateTrigger(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index cf41727..199049d 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -63,6 +63,7 @@ typedef struct DWORD priority, maxRunTime; LPWSTR accountName; DWORD trigger_count; + TASK_TRIGGER *trigger; } TaskImpl; static inline TaskImpl *impl_from_ITask(ITask *iface) @@ -83,6 +84,7 @@ static void TaskDestructor(TaskImpl *This) ITaskDefinition_Release(This->task); HeapFree(GetProcessHeap(), 0, This->task_name); HeapFree(GetProcessHeap(), 0, This->accountName); + HeapFree(GetProcessHeap(), 0, This->trigger); HeapFree(GetProcessHeap(), 0, This); InterlockedDecrement(&dll_ref); } @@ -139,13 +141,34 @@ static ULONG WINAPI MSTASK_ITask_Release( return ref; } -static HRESULT WINAPI MSTASK_ITask_CreateTrigger( - ITask* iface, - WORD *piNewTrigger, - ITaskTrigger **ppTrigger) +static HRESULT WINAPI MSTASK_ITask_CreateTrigger(ITask *iface, WORD *idx, ITaskTrigger **task_trigger) { - TRACE("(%p, %p, %p)\n", iface, piNewTrigger, ppTrigger); - return TaskTriggerConstructor((LPVOID *)ppTrigger); + TaskImpl *This = impl_from_ITask(iface); + TASK_TRIGGER *new_trigger; + HRESULT hr; + + TRACE("(%p, %p, %p)\n", iface, idx, task_trigger); + + hr = TaskTriggerConstructor((void **)task_trigger); + if (hr != S_OK) return hr; + + if (This->trigger) + new_trigger = heap_realloc(This->trigger, sizeof(This->trigger[0]) * (This->trigger_count + 1)); + else + new_trigger = heap_alloc(sizeof(This->trigger[0])); + if (!new_trigger) + { + ITaskTrigger_Release(*task_trigger); + return E_OUTOFMEMORY; + } + + This->trigger = new_trigger; + + hr = ITaskTrigger_GetTrigger(*task_trigger, &This->trigger[This->trigger_count]); + if (hr == S_OK) + *idx = This->trigger_count++; + + return hr; } static HRESULT WINAPI MSTASK_ITask_DeleteTrigger( @@ -1135,6 +1158,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) This->priority = NORMAL_PRIORITY_CLASS; This->accountName = NULL; This->trigger_count = 0; + This->trigger = NULL; /* Default time is 3 days = 259200000 ms */ This->maxRunTime = 259200000;
1
0
0
0
Dmitry Timoshkov : mstask: Implement ITask::GetTriggerCount().
by Alexandre Julliard
24 Apr '18
24 Apr '18
Module: wine Branch: master Commit: 90160bd65d28af5f8c355a62c1e2966481727ebc URL:
https://source.winehq.org/git/wine.git/?a=commit;h=90160bd65d28af5f8c355a62…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 24 16:13:43 2018 +0800 mstask: Implement ITask::GetTriggerCount(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index f74d439..cf41727 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -62,6 +62,7 @@ typedef struct WORD idle_minutes, deadline_minutes; DWORD priority, maxRunTime; LPWSTR accountName; + DWORD trigger_count; } TaskImpl; static inline TaskImpl *impl_from_ITask(ITask *iface) @@ -155,12 +156,14 @@ static HRESULT WINAPI MSTASK_ITask_DeleteTrigger( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_GetTriggerCount( - ITask* iface, - WORD *plCount) +static HRESULT WINAPI MSTASK_ITask_GetTriggerCount(ITask *iface, WORD *count) { - FIXME("(%p, %p): stub\n", iface, plCount); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p, %p)\n", iface, count); + + *count = This->trigger_count; + return S_OK; } static HRESULT WINAPI MSTASK_ITask_GetTrigger( @@ -1131,6 +1134,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) This->deadline_minutes = 60; This->priority = NORMAL_PRIORITY_CLASS; This->accountName = NULL; + This->trigger_count = 0; /* Default time is 3 days = 259200000 ms */ This->maxRunTime = 259200000;
1
0
0
0
Dmitry Timoshkov : mstask: Fix saving the triggers.
by Alexandre Julliard
24 Apr '18
24 Apr '18
Module: wine Branch: master Commit: bdb78491cb11dc24336d7cd0bb2fd08d0ce166bd URL:
https://source.winehq.org/git/wine.git/?a=commit;h=bdb78491cb11dc24336d7cd0…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 24 16:13:38 2018 +0800 mstask: Fix saving the triggers. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 58ff601..f74d439 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -980,12 +980,10 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta goto failed; } - /* Trigegrs */ - if (!write_triggers(hfile, task)) - { - hr = HRESULT_FROM_WIN32(GetLastError()); + /* Triggers */ + hr = write_triggers(task, hfile); + if (hr != S_OK) goto failed; - } /* Signature */ if (!write_signature(hfile))
1
0
0
0
Dmitry Timoshkov : mstask: Initialize task file name in the task constructor.
by Alexandre Julliard
24 Apr '18
24 Apr '18
Module: wine Branch: master Commit: f997b162303ecee8b32afd46c6ed62d1d357210f URL:
https://source.winehq.org/git/wine.git/?a=commit;h=f997b162303ecee8b32afd46…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 24 16:13:31 2018 +0800 mstask: Initialize task file name in the task constructor. IPersistFile::Save() receives full path name. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index e390aa6..58ff601 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -850,10 +850,8 @@ static BOOL write_unicode_string(HANDLE hfile, const WCHAR *str) return WriteFile(hfile, str, count, &size, NULL); } -static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR name, BOOL remember) +static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR task_name, BOOL remember) { - static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\',0 }; - static const WCHAR jobW[] = { '.','j','o','b',0 }; static WCHAR authorW[] = { 'W','i','n','e',0 }; static WCHAR commentW[] = { 'C','r','e','a','t','e','d',' ','b','y',' ','W','i','n','e',0 }; FIXDLEN_DATA fixed; @@ -864,25 +862,17 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR na ITask *task = &This->ITask_iface; LPWSTR appname = NULL, params = NULL, workdir = NULL, creator = NULL, comment = NULL; BYTE *user_data = NULL; - WCHAR task_name[MAX_PATH]; HRESULT hr; - TRACE("(%p, %s, %d)\n", iface, debugstr_w(name), remember); + TRACE("(%p, %s, %d)\n", iface, debugstr_w(task_name), remember); - disposition = name ? CREATE_NEW : OPEN_ALWAYS; + disposition = task_name ? CREATE_NEW : OPEN_ALWAYS; - if (!name) + if (!task_name) { - name = This->task_name; + task_name = This->task_name; remember = FALSE; } - else if (strchrW(name, '.')) - return E_INVALIDARG; - - GetWindowsDirectoryW(task_name, MAX_PATH); - lstrcatW(task_name, tasksW); - lstrcatW(task_name, name); - lstrcatW(task_name, jobW); ITask_GetComment(task, &comment); if (!comment) comment = commentW; @@ -1018,11 +1008,11 @@ failed: CloseHandle(hfile); if (hr != S_OK) - DeleteFileW(name); + DeleteFileW(task_name); else if (remember) { HeapFree(GetProcessHeap(), 0, This->task_name); - This->task_name = heap_strdupW(name); + This->task_name = heap_strdupW(task_name); } return hr; } @@ -1104,14 +1094,24 @@ static const IPersistFileVtbl MSTASK_IPersistFileVtbl = MSTASK_IPersistFile_GetCurFile }; -HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **task) +HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) { + static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\',0 }; + static const WCHAR jobW[] = { '.','j','o','b',0 }; TaskImpl *This; + WCHAR task_name[MAX_PATH]; ITaskDefinition *taskdef; IActionCollection *actions; HRESULT hr; - TRACE("(%s, %p)\n", debugstr_w(task_name), task); + TRACE("(%s, %p)\n", debugstr_w(name), task); + + if (strchrW(name, '.')) return E_INVALIDARG; + + GetWindowsDirectoryW(task_name, MAX_PATH); + lstrcatW(task_name, tasksW); + lstrcatW(task_name, name); + lstrcatW(task_name, jobW); hr = ITaskService_NewTask(service, 0, &taskdef); if (hr != S_OK) return hr;
1
0
0
0
Dmitry Timoshkov : mstask: Save a task with at least 1 trigger to follow the .job file spec.
by Alexandre Julliard
24 Apr '18
24 Apr '18
Module: wine Branch: master Commit: 66d8e7f6a96a230fd44d094cbea82c512726965e URL:
https://source.winehq.org/git/wine.git/?a=commit;h=66d8e7f6a96a230fd44d094c…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 24 16:13:24 2018 +0800 mstask: Save a task with at least 1 trigger to follow the .job file spec. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index d64860a..e390aa6 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -793,9 +793,10 @@ static BOOL write_user_data(HANDLE hfile, BYTE *data, WORD data_size) static HRESULT write_triggers(ITask *task, HANDLE hfile) { - WORD count, i; + WORD count, i, idx = 0xffff; DWORD size; HRESULT hr; + ITaskTrigger *trigger; hr = ITask_GetTriggerCount(task, &count); if (hr != S_OK) return hr; @@ -803,9 +804,18 @@ static HRESULT write_triggers(ITask *task, HANDLE hfile) if (!WriteFile(hfile, &count, sizeof(count), &size, NULL)) return HRESULT_FROM_WIN32(GetLastError()); + /* Windows saves a .job with at least 1 trigger */ + if (!count) + { + hr = ITask_CreateTrigger(task, &idx, &trigger); + if (hr != S_OK) return hr; + ITaskTrigger_Release(trigger); + + count = 1; + } + for (i = 0; i < count; i++) { - ITaskTrigger *trigger; TASK_TRIGGER task_trigger; hr = ITask_GetTrigger(task, i, &trigger); @@ -813,13 +823,16 @@ static HRESULT write_triggers(ITask *task, HANDLE hfile) hr = ITaskTrigger_GetTrigger(trigger, &task_trigger); ITaskTrigger_Release(trigger); - if (hr != S_OK) return hr; + if (hr != S_OK) break; if (!WriteFile(hfile, &task_trigger, sizeof(task_trigger), &size, NULL)) return HRESULT_FROM_WIN32(GetLastError()); } - return S_OK; + if (idx != 0xffff) + ITask_DeleteTrigger(task, idx); + + return hr; } static BOOL write_unicode_string(HANDLE hfile, const WCHAR *str)
1
0
0
0
Dmitry Timoshkov : schedsvc: Print an error if the service couldn' t start monitoring the tasks directory.
by Alexandre Julliard
24 Apr '18
24 Apr '18
Module: wine Branch: master Commit: 0f77a4cb8207dfdae6344e07d3e3d2217274094b URL:
https://source.winehq.org/git/wine.git/?a=commit;h=0f77a4cb8207dfdae6344e07…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 24 16:13:20 2018 +0800 schedsvc: Print an error if the service couldn't start monitoring the tasks directory. This happens for old prefixes with disabled updates. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/svc_main.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 1ccc345..fb7732c 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -50,7 +50,14 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) htasks = CreateFileW(path, FILE_LIST_DIRECTORY, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, NULL); - if (htasks == INVALID_HANDLE_VALUE) return -1; + if (htasks == INVALID_HANDLE_VALUE) + { + ERR("Couldn't start monitoring %s for tasks, error %u\n", debugstr_w(path), GetLastError()); + /* Probably this is an old prefix with disabled updates */ + if (GetLastError() == ERROR_PATH_NOT_FOUND || GetLastError() == ERROR_FILE_NOT_FOUND) + ERR("Please create the directory manually\n"); + return -1; + } memset(&ov, 0, sizeof(ov)); ov.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL);
1
0
0
0
Dmitry Timoshkov : schedsvc: Allow others to read the file.
by Alexandre Julliard
24 Apr '18
24 Apr '18
Module: wine Branch: master Commit: a49f07204047b3d742a9d2f6956506c669026fd2 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=a49f07204047b3d742a9d2f6…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 24 16:13:16 2018 +0800 schedsvc: Allow others to read the file. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/atsvc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index e46c1e9..83e7dca 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -282,7 +282,7 @@ void add_job(const WCHAR *name) try = 1; for (;;) { - file = CreateFileW(name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + file = CreateFileW(name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); if (file == INVALID_HANDLE_VALUE) { TRACE("Failed to open %s, error %u\n", debugstr_w(name), GetLastError());
1
0
0
0
Owen Rudge : wsdapi: Add MetadataVersion to Hello message.
by Alexandre Julliard
24 Apr '18
24 Apr '18
Module: wine Branch: master Commit: d11a18383b46651d7a31e64b6daa5e7bf3bf07f2 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=d11a18383b46651d7a31e64b…
Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Apr 23 21:12:31 2018 +0100 wsdapi: Add MetadataVersion to Hello message. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/soap.c | 7 +++++++ dlls/wsdapi/tests/discovery.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 9ba934e..e7cd651 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -80,6 +80,7 @@ static const WCHAR addressString[] = { 'A','d','d','r','e','s','s', 0 }; static const WCHAR typesString[] = { 'T','y','p','e','s', 0 }; static const WCHAR scopesString[] = { 'S','c','o','p','e','s', 0 }; static const WCHAR xAddrsString[] = { 'X','A','d','d','r','s', 0 }; +static const WCHAR metadataVersionString[] = { 'M','e','t','a','d','a','t','a','V','e','r','s','i','o','n', 0 }; struct discovered_namespace { @@ -968,6 +969,12 @@ HRESULT send_hello_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLON if (FAILED(ret)) goto cleanup; } + /* <wsd:MetadataVersion> */ + ret = add_child_element(impl->xmlContext, hello_element, discoveryNsUri, metadataVersionString, + ulonglong_to_string(hello_element, min(UINT_MAX, metadata_ver)), NULL); + + if (FAILED(ret)) goto cleanup; + /* Write any body elements */ if (any != NULL) { diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 0576c8f..5d10d3d 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -699,8 +699,8 @@ static void Publish_tests(void) ok(hello_message_seen == TRUE, "Hello message not received\n"); ok(endpoint_reference_seen == TRUE, "EndpointReference not received\n"); ok(app_sequence_seen == TRUE, "AppSequence not received\n"); - todo_wine ok(metadata_version_seen == TRUE, "MetadataVersion not received\n"); - todo_wine ok(messageOK == TRUE, "Hello message metadata not received\n"); + ok(metadata_version_seen == TRUE, "MetadataVersion not received\n"); + ok(messageOK == TRUE, "Hello message metadata not received\n"); ok(any_header_seen == TRUE, "Custom header not received\n"); ok(wine_ns_seen == TRUE, "Wine namespace not received\n"); ok(body_hello_seen == TRUE, "Body and Hello elements not received\n");
1
0
0
0
← Newer
1
...
10
11
12
13
14
15
16
...
55
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
Results per page:
10
25
50
100
200