December 2017 - Wine-Devel - list.winehq.org

[PATCH v4 resend 4/5] winebus.sys: Process device reports for linux event devices
by Aric Stewart Dec. 1, 2017

Dec. 1, 2017

v2: Updates from Sebastian Lackner v3: Suggestions from Roderick Colenbrander v3: Do not force axis ranges, handle SYN_DROPPED Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 235 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 229 insertions(+), 6 deletions(-)

1 0

[PATCH v4 resend 3/5] winebus.sys: Implement get_string for linux event devices
by Aric Stewart Dec. 1, 2017

Dec. 1, 2017

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-)

1 0

[PATCH v4 resend 2/5] winebus.sys: Build device reports for linux event devices
by Aric Stewart Dec. 1, 2017

Dec. 1, 2017

v2: Updates from Sebastian Lackner v3: Suggestions from Roderick Colenbrander v3: Do not hardcode min/max for axis Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 457 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 455 insertions(+), 2 deletions(-)

1 0

[PATCH v4 resend 1/5] winebus.sys: Handle linux input event device via udev
by Aric Stewart Dec. 1, 2017

Dec. 1, 2017

v2: Updates from Sebastian Lackner v3: Cross bus duplicate device detection added for udev devices v4: Further refinements from Sebastian Lackner Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus.h | 6 ++ dlls/winebus.sys/bus_udev.c | 172 +++++++++++++++++++++++++++++++++++++++++--- dlls/winebus.sys/main.c | 48 +++++++++++++ 3 files changed, 218 insertions(+), 8 deletions(-)

1 0

[PATCH v2] msvcrt: Fix buffer size checks in swscanf_s
by Piotr Caban Dec. 1, 2017

Dec. 1, 2017

For bug #44075 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/scanf.h | 6 +++--- dlls/msvcrt/tests/scanf.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-)

1 0

[PATCH 2/5] taskschd: Implement IDailyTrigger_put_StartBoundary.
by Hans Leidekker Dec. 1, 2017

Dec. 1, 2017

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 15 ++++++++++++++- dlls/taskschd/tests/scheduler.c | 11 +++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 9959f042a2..a469e12347 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -39,6 +39,7 @@ typedef struct { IDailyTrigger IDailyTrigger_iface; LONG ref; short interval; + WCHAR *start_boundary; } DailyTrigger; static inline DailyTrigger *impl_from_IDailyTrigger(IDailyTrigger *iface) @@ -88,7 +89,11 @@ static ULONG WINAPI DailyTrigger_Release(IDailyTrigger *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) + { + TRACE("destroying %p\n", iface); + heap_free(This->start_boundary); heap_free(This); + } return ref; } @@ -183,7 +188,14 @@ static HRESULT WINAPI DailyTrigger_get_StartBoundary(IDailyTrigger *iface, BSTR static HRESULT WINAPI DailyTrigger_put_StartBoundary(IDailyTrigger *iface, BSTR start) { DailyTrigger *This = impl_from_IDailyTrigger(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(start)); + WCHAR *str = NULL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(start)); + + if (start && !(This->start_boundary = heap_strdupW(start))) return E_OUTOFMEMORY; + heap_free(This->start_boundary); + This->start_boundary = str; + return S_OK; } @@ -290,6 +302,7 @@ static HRESULT DailyTrigger_create(ITrigger **trigger) daily_trigger->IDailyTrigger_iface.lpVtbl = &DailyTrigger_vtbl; daily_trigger->ref = 1; daily_trigger->interval = 1; + daily_trigger->start_boundary = NULL; *trigger = (ITrigger*)&daily_trigger->IDailyTrigger_iface; return S_OK; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index c7de7c7041..0f3010e30f 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1195,7 +1195,10 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) static void test_daily_trigger(ITrigger *trigger) { + static const WCHAR startW[] = + {'2','0','0','4','-','0','1','-','0','1','T','0','0',':','0','0',':','0','0',0}; IDailyTrigger *daily_trigger; + BSTR start_boundary; short interval; HRESULT hr; @@ -1225,6 +1228,14 @@ static void test_daily_trigger(ITrigger *trigger) ok(hr == S_OK, "get_DaysInterval failed: %08x\n", hr); ok(interval == 2, "interval = %d\n", interval); + start_boundary = SysAllocString(startW); + hr = IDailyTrigger_put_StartBoundary(daily_trigger, start_boundary); + ok(hr == S_OK, "put_StartBoundary failed: %08x\n", hr); + SysFreeString(start_boundary); + + hr = IDailyTrigger_put_StartBoundary(daily_trigger, NULL); + ok(hr == S_OK, "put_StartBoundary failed: %08x\n", hr); + IDailyTrigger_Release(daily_trigger); } -- 2.11.0

2 3

[PATCH v2 5/5] taskschd: Implement IDailyTrigger_get_Enabled.
by Hans Leidekker Dec. 1, 2017

Dec. 1, 2017

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 11 ++++++++--- dlls/taskschd/tests/scheduler.c | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index d720d50f87..a8b819c360 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -224,8 +224,13 @@ static HRESULT WINAPI DailyTrigger_put_EndBoundary(IDailyTrigger *iface, BSTR en static HRESULT WINAPI DailyTrigger_get_Enabled(IDailyTrigger *iface, VARIANT_BOOL *enabled) { DailyTrigger *This = impl_from_IDailyTrigger(iface); - FIXME("(%p)->(%p)\n", This, enabled); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, enabled); + + if (!enabled) return E_POINTER; + + *enabled = This->enabled ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI DailyTrigger_put_Enabled(IDailyTrigger *iface, VARIANT_BOOL enabled) @@ -314,7 +319,7 @@ static HRESULT DailyTrigger_create(ITrigger **trigger) daily_trigger->ref = 1; daily_trigger->interval = 1; daily_trigger->start_boundary = NULL; - daily_trigger->enabled = FALSE; + daily_trigger->enabled = TRUE; *trigger = (ITrigger*)&daily_trigger->IDailyTrigger_iface; return S_OK; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index d0477a82a4..c60fd1d9d7 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1223,6 +1223,7 @@ static void test_daily_trigger(ITrigger *trigger) }; IDailyTrigger *daily_trigger; BSTR start_boundary; + VARIANT_BOOL enabled; short interval; HRESULT hr; ULONG i; @@ -1281,6 +1282,22 @@ static void test_daily_trigger(ITrigger *trigger) hr = IDailyTrigger_put_StartBoundary(daily_trigger, NULL); ok(hr == S_OK, "put_StartBoundary failed: %08x\n", hr); + hr = IDailyTrigger_get_Enabled(daily_trigger, NULL); + ok(hr == E_POINTER, "get_Enabled failed: %08x\n", hr); + + enabled = VARIANT_FALSE; + hr = IDailyTrigger_get_Enabled(daily_trigger, &enabled); + ok(hr == S_OK, "get_Enabled failed: %08x\n", hr); + ok(enabled == VARIANT_TRUE, "got %d\n", enabled); + + hr = IDailyTrigger_put_Enabled(daily_trigger, VARIANT_FALSE); + ok(hr == S_OK, "put_Enabled failed: %08x\n", hr); + + enabled = VARIANT_TRUE; + hr = IDailyTrigger_get_Enabled(daily_trigger, &enabled); + ok(hr == S_OK, "get_Enabled failed: %08x\n", hr); + ok(enabled == VARIANT_FALSE, "got %d\n", enabled); + IDailyTrigger_Release(daily_trigger); } -- 2.11.0

1 0

[PATCH v2 4/5] taskschd: Implement IDailyTrigger_put_Enabled.
by Hans Leidekker Dec. 1, 2017

Dec. 1, 2017

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 8b64663814..d720d50f87 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -40,6 +40,7 @@ typedef struct { LONG ref; short interval; WCHAR *start_boundary; + BOOL enabled; } DailyTrigger; static inline DailyTrigger *impl_from_IDailyTrigger(IDailyTrigger *iface) @@ -230,7 +231,10 @@ static HRESULT WINAPI DailyTrigger_get_Enabled(IDailyTrigger *iface, VARIANT_BOO static HRESULT WINAPI DailyTrigger_put_Enabled(IDailyTrigger *iface, VARIANT_BOOL enabled) { DailyTrigger *This = impl_from_IDailyTrigger(iface); - FIXME("(%p)->(%x)\n", This, enabled); + + TRACE("(%p)->(%x)\n", This, enabled); + + This->enabled = enabled ? TRUE : FALSE; return S_OK; } @@ -310,6 +314,7 @@ static HRESULT DailyTrigger_create(ITrigger **trigger) daily_trigger->ref = 1; daily_trigger->interval = 1; daily_trigger->start_boundary = NULL; + daily_trigger->enabled = FALSE; *trigger = (ITrigger*)&daily_trigger->IDailyTrigger_iface; return S_OK; -- 2.11.0

1 0

[PATCH v2 3/5] taskschd: Implement IDailyTrigger_get_StartBoundary.
by Hans Leidekker Dec. 1, 2017

Dec. 1, 2017

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 11 +++++++++-- dlls/taskschd/tests/scheduler.c | 17 +++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index ee5a7dd4b6..8b64663814 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -181,8 +181,15 @@ static HRESULT WINAPI DailyTrigger_put_ExecutionTimeLimit(IDailyTrigger *iface, static HRESULT WINAPI DailyTrigger_get_StartBoundary(IDailyTrigger *iface, BSTR *start) { DailyTrigger *This = impl_from_IDailyTrigger(iface); - FIXME("(%p)->(%p)\n", This, start); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, start); + + if (!start) return E_POINTER; + + if (!This->start_boundary) *start = NULL; + else if (!(*start = SysAllocString(This->start_boundary))) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI DailyTrigger_put_StartBoundary(IDailyTrigger *iface, BSTR start) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index fb6d626e14..d0477a82a4 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1253,12 +1253,29 @@ static void test_daily_trigger(ITrigger *trigger) ok(hr == S_OK, "get_DaysInterval failed: %08x\n", hr); ok(interval == 2, "interval = %d\n", interval); + hr = IDailyTrigger_get_StartBoundary(daily_trigger, NULL); + ok(hr == E_POINTER, "get_StartBoundary failed: %08x\n", hr); + + start_boundary = (BSTR)0xdeadbeef; + hr = IDailyTrigger_get_StartBoundary(daily_trigger, &start_boundary); + ok(hr == S_OK, "get_StartBoundary failed: %08x\n", hr); + ok(start_boundary == NULL, "start_boundary not set\n"); + for (i = 0; i < sizeof(start_test)/sizeof(start_test[0]); i++) { start_boundary = SysAllocString(start_test[i].str); hr = IDailyTrigger_put_StartBoundary(daily_trigger, start_boundary); ok(hr == start_test[i].hr, "%u: got %08x expected %08x\n", i, hr, start_test[i].hr); SysFreeString(start_boundary); + if (hr == S_OK) + { + start_boundary = NULL; + hr = IDailyTrigger_get_StartBoundary(daily_trigger, &start_boundary); + ok(hr == S_OK, "%u: got %08x\n", i, hr); + ok(start_boundary != NULL, "start_boundary not set\n"); + ok(!lstrcmpW(start_boundary, start_test[i].str), "%u: got %s\n", i, wine_dbgstr_w(start_boundary)); + SysFreeString(start_boundary); + } } hr = IDailyTrigger_put_StartBoundary(daily_trigger, NULL); -- 2.11.0

1 0

[PATCH v2 2/5] taskschd: Implement IDailyTrigger_put_StartBoundary.
by Hans Leidekker Dec. 1, 2017

Dec. 1, 2017

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 15 ++++++++++++++- dlls/taskschd/tests/scheduler.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 9959f042a2..ee5a7dd4b6 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -39,6 +39,7 @@ typedef struct { IDailyTrigger IDailyTrigger_iface; LONG ref; short interval; + WCHAR *start_boundary; } DailyTrigger; static inline DailyTrigger *impl_from_IDailyTrigger(IDailyTrigger *iface) @@ -88,7 +89,11 @@ static ULONG WINAPI DailyTrigger_Release(IDailyTrigger *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) + { + TRACE("destroying %p\n", iface); + heap_free(This->start_boundary); heap_free(This); + } return ref; } @@ -183,7 +188,14 @@ static HRESULT WINAPI DailyTrigger_get_StartBoundary(IDailyTrigger *iface, BSTR static HRESULT WINAPI DailyTrigger_put_StartBoundary(IDailyTrigger *iface, BSTR start) { DailyTrigger *This = impl_from_IDailyTrigger(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(start)); + WCHAR *str = NULL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(start)); + + if (start && !(str = heap_strdupW(start))) return E_OUTOFMEMORY; + heap_free(This->start_boundary); + This->start_boundary = str; + return S_OK; } @@ -290,6 +302,7 @@ static HRESULT DailyTrigger_create(ITrigger **trigger) daily_trigger->IDailyTrigger_iface.lpVtbl = &DailyTrigger_vtbl; daily_trigger->ref = 1; daily_trigger->interval = 1; + daily_trigger->start_boundary = NULL; *trigger = (ITrigger*)&daily_trigger->IDailyTrigger_iface; return S_OK; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index c7de7c7041..fb6d626e14 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1195,9 +1195,37 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) static void test_daily_trigger(ITrigger *trigger) { + static const WCHAR startW[] = + {'2','0','0','4','-','0','1','-','0','1','T','0','0',':','0','0',':','0','0',0}; + static const WCHAR start2W[] = + {'2','0','0','4','-','0','1','-','0','1','T','0','0',':','0','0',':','0','0','Z',0}; + static const WCHAR start3W[] = + {'2','0','0','4','-','0','1','-','0','1','T','0','0',':','0','0',':','0','0','+','0','1',':','0','0',0}; + static const WCHAR start4W[] = + {'2','0','0','4','.','0','1','.','0','1','T','0','0','.','0','0','.','0','0',0}; + static const WCHAR start5W[] = + {'9','9','9','9','-','9','9','-','9','9','T','9','9',':','9','9',':','9','9',0}; + static const WCHAR start6W[] = + {'i','n','v','a','l','i','d',0}; + static const struct + { + const WCHAR *str; + HRESULT hr; + } + start_test[] = + { + {startW, S_OK}, + {start2W, S_OK}, + {start3W, S_OK}, + {start4W, S_OK}, + {start5W, S_OK}, + {start6W, S_OK}, + }; IDailyTrigger *daily_trigger; + BSTR start_boundary; short interval; HRESULT hr; + ULONG i; hr = ITrigger_QueryInterface(trigger, &IID_IDailyTrigger, (void**)&daily_trigger); ok(hr == S_OK, "Could not get IDailyTrigger iface: %08x\n", hr); @@ -1225,6 +1253,17 @@ static void test_daily_trigger(ITrigger *trigger) ok(hr == S_OK, "get_DaysInterval failed: %08x\n", hr); ok(interval == 2, "interval = %d\n", interval); + for (i = 0; i < sizeof(start_test)/sizeof(start_test[0]); i++) + { + start_boundary = SysAllocString(start_test[i].str); + hr = IDailyTrigger_put_StartBoundary(daily_trigger, start_boundary); + ok(hr == start_test[i].hr, "%u: got %08x expected %08x\n", i, hr, start_test[i].hr); + SysFreeString(start_boundary); + } + + hr = IDailyTrigger_put_StartBoundary(daily_trigger, NULL); + ok(hr == S_OK, "put_StartBoundary failed: %08x\n", hr); + IDailyTrigger_Release(daily_trigger); } -- 2.11.0

1 0

[PATCH v2 1/5] taskschd: Consistently check for allocation failure.
by Hans Leidekker Dec. 1, 2017

Dec. 1, 2017

v2: Fix split and add more tests for the StartBoundary property. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/folder_collection.c | 6 ++++- dlls/taskschd/task.c | 54 +++++++++++++++++++++------------------ 2 files changed, 34 insertions(+), 26 deletions(-) diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index 47c962015d..969baec831 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -236,7 +236,11 @@ HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **o folders->ITaskFolderCollection_iface.lpVtbl = &TaskFolderCollection_vtbl; folders->ref = 1; - folders->path = heap_strdupW(path); + if (!(folders->path = heap_strdupW(path))) + { + heap_free(folders); + return E_OUTOFMEMORY; + } folders->count = count; folders->list = list; *obj = &folders->ITaskFolderCollection_iface; diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index df75236d9d..9959f042a2 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -542,7 +542,9 @@ static HRESULT WINAPI RegistrationInfo_get_Description(IRegistrationInfo *iface, if (!description) return E_POINTER; - *description = SysAllocString(reginfo->description); + if (!reginfo->description) *description = NULL; + else if (!(*description = SysAllocString(reginfo->description))) return E_OUTOFMEMORY; + return S_OK; } @@ -568,7 +570,9 @@ static HRESULT WINAPI RegistrationInfo_get_Author(IRegistrationInfo *iface, BSTR if (!author) return E_POINTER; - *author = SysAllocString(reginfo->author); + if (!reginfo->author) *author = NULL; + else if (!(*author = SysAllocString(reginfo->author))) return E_OUTOFMEMORY; + return S_OK; } @@ -594,7 +598,9 @@ static HRESULT WINAPI RegistrationInfo_get_Version(IRegistrationInfo *iface, BST if (!version) return E_POINTER; - *version = SysAllocString(reginfo->version); + if (!reginfo->version) *version = NULL; + else if (!(*version = SysAllocString(reginfo->version))) return E_OUTOFMEMORY; + return S_OK; } @@ -620,7 +626,9 @@ static HRESULT WINAPI RegistrationInfo_get_Date(IRegistrationInfo *iface, BSTR * if (!date) return E_POINTER; - *date = SysAllocString(reginfo->date); + if (!reginfo->date) *date = NULL; + else if (!(*date = SysAllocString(reginfo->date))) return E_OUTOFMEMORY; + return S_OK; } @@ -646,7 +654,9 @@ static HRESULT WINAPI RegistrationInfo_get_Documentation(IRegistrationInfo *ifac if (!doc) return E_POINTER; - *doc = SysAllocString(reginfo->documentation); + if (!reginfo->documentation) *doc = NULL; + else if (!(*doc = SysAllocString(reginfo->documentation))) return E_OUTOFMEMORY; + return S_OK; } @@ -684,7 +694,9 @@ static HRESULT WINAPI RegistrationInfo_get_URI(IRegistrationInfo *iface, BSTR *u if (!uri) return E_POINTER; - *uri = SysAllocString(reginfo->uri); + if (!reginfo->uri) *uri = NULL; + else if (!(*uri = SysAllocString(reginfo->uri))) return E_OUTOFMEMORY; + return S_OK; } @@ -722,7 +734,9 @@ static HRESULT WINAPI RegistrationInfo_get_Source(IRegistrationInfo *iface, BSTR if (!source) return E_POINTER; - *source = SysAllocString(reginfo->source); + if (!reginfo->source) *source = NULL; + else if (!(*source = SysAllocString(reginfo->source))) return E_OUTOFMEMORY; + return S_OK; } @@ -921,8 +935,8 @@ static HRESULT WINAPI TaskSettings_get_RestartInterval(ITaskSettings *iface, BST return S_OK; } - *interval = SysAllocString(taskset->restart_interval); - if (!*interval) return E_OUTOFMEMORY; + if (!taskset->restart_interval) *interval = NULL; + else if (!(*interval = SysAllocString(taskset->restart_interval))) return E_OUTOFMEMORY; return S_OK; } @@ -1135,8 +1149,8 @@ static HRESULT WINAPI TaskSettings_get_ExecutionTimeLimit(ITaskSettings *iface, return S_OK; } - *limit = SysAllocString(taskset->execution_time_limit); - if (!*limit) return E_OUTOFMEMORY; + if (!taskset->execution_time_limit) *limit = NULL; + else if (!(*limit = SysAllocString(taskset->execution_time_limit))) return E_OUTOFMEMORY; return S_OK; } @@ -1187,14 +1201,8 @@ static HRESULT WINAPI TaskSettings_get_DeleteExpiredTaskAfter(ITaskSettings *ifa if (!delay) return E_POINTER; - if (!taskset->delete_expired_task_after) - { - *delay = NULL; - return S_OK; - } - - *delay = SysAllocString(taskset->delete_expired_task_after); - if (!*delay) return E_OUTOFMEMORY; + if (!taskset->delete_expired_task_after) *delay = NULL; + else if (!(*delay = SysAllocString(taskset->delete_expired_task_after))) return E_OUTOFMEMORY; return S_OK; } @@ -1746,13 +1754,9 @@ static HRESULT WINAPI ExecAction_get_Path(IExecAction *iface, BSTR *path) if (!path) return E_POINTER; - if (!action->path) - { - *path = NULL; - return S_OK; - } + if (!action->path) *path = NULL; + else if (!(*path = SysAllocString(action->path))) return E_OUTOFMEMORY; - if (!(*path = SysAllocString(action->path))) return E_OUTOFMEMORY; return S_OK; } -- 2.11.0

1 0

[PATCH] v2: shell32: add stub for Shell_NotifyIconGetRect
by Louis Lenders Dec. 1, 2017

Dec. 1, 2017

Now with signed-off line v2: - removed SetLastError (ERROR_CALL_NOT_IMPLEMENTED) - corrected prototype for Shell_NotifyIconGetRect in shellapi.h

1 0

[PATCH] msvcrt: Fix buffer size checks in swscanf_s
by Piotr Caban Dec. 1, 2017

Dec. 1, 2017

For bug #44075 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/scanf.h | 6 +++--- dlls/msvcrt/tests/scanf.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-)

1 0

[PATCH 3/5] taskschd: Implement IDailyTrigger_put_Enabled.
by Hans Leidekker Dec. 1, 2017

Dec. 1, 2017

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index a469e12347..84e84913fc 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -40,6 +40,7 @@ typedef struct { LONG ref; short interval; WCHAR *start_boundary; + BOOL enabled; } DailyTrigger; static inline DailyTrigger *impl_from_IDailyTrigger(IDailyTrigger *iface) @@ -192,7 +193,7 @@ static HRESULT WINAPI DailyTrigger_put_StartBoundary(IDailyTrigger *iface, BSTR TRACE("(%p)->(%s)\n", This, debugstr_w(start)); - if (start && !(This->start_boundary = heap_strdupW(start))) return E_OUTOFMEMORY; + if (start && !(str = heap_strdupW(start))) return E_OUTOFMEMORY; heap_free(This->start_boundary); This->start_boundary = str; @@ -223,7 +224,10 @@ static HRESULT WINAPI DailyTrigger_get_Enabled(IDailyTrigger *iface, VARIANT_BOO static HRESULT WINAPI DailyTrigger_put_Enabled(IDailyTrigger *iface, VARIANT_BOOL enabled) { DailyTrigger *This = impl_from_IDailyTrigger(iface); - FIXME("(%p)->(%x)\n", This, enabled); + + TRACE("(%p)->(%x)\n", This, enabled); + + This->enabled = enabled ? TRUE : FALSE; return S_OK; } @@ -303,6 +307,7 @@ static HRESULT DailyTrigger_create(ITrigger **trigger) daily_trigger->ref = 1; daily_trigger->interval = 1; daily_trigger->start_boundary = NULL; + daily_trigger->enabled = FALSE; *trigger = (ITrigger*)&daily_trigger->IDailyTrigger_iface; return S_OK; -- 2.11.0

2 1

[PATCH 5/5] taskschd: Implement IDailyTrigger_get_Enabled.
by Hans Leidekker Dec. 1, 2017

Dec. 1, 2017

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 11 ++++++++--- dlls/taskschd/tests/scheduler.c | 16 +++++++++++++++- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index d720d50f87..a8b819c360 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -224,8 +224,13 @@ static HRESULT WINAPI DailyTrigger_put_EndBoundary(IDailyTrigger *iface, BSTR en static HRESULT WINAPI DailyTrigger_get_Enabled(IDailyTrigger *iface, VARIANT_BOOL *enabled) { DailyTrigger *This = impl_from_IDailyTrigger(iface); - FIXME("(%p)->(%p)\n", This, enabled); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, enabled); + + if (!enabled) return E_POINTER; + + *enabled = This->enabled ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI DailyTrigger_put_Enabled(IDailyTrigger *iface, VARIANT_BOOL enabled) @@ -314,7 +319,7 @@ static HRESULT DailyTrigger_create(ITrigger **trigger) daily_trigger->ref = 1; daily_trigger->interval = 1; daily_trigger->start_boundary = NULL; - daily_trigger->enabled = FALSE; + daily_trigger->enabled = TRUE; *trigger = (ITrigger*)&daily_trigger->IDailyTrigger_iface; return S_OK; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index a9bf615dc3..60e5943fbe 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1199,6 +1199,7 @@ static void test_daily_trigger(ITrigger *trigger) {'2','0','0','4','-','0','1','-','0','1','T','0','0',':','0','0',':','0','0',0}; IDailyTrigger *daily_trigger; BSTR start_boundary; + VARIANT_BOOL enabled; short interval; HRESULT hr; @@ -1250,9 +1251,22 @@ static void test_daily_trigger(ITrigger *trigger) hr = IDailyTrigger_put_StartBoundary(daily_trigger, NULL); ok(hr == S_OK, "put_StartBoundary failed: %08x\n", hr); - hr = IDailyTrigger_put_Enabled(daily_trigger, VARIANT_TRUE); + hr = IDailyTrigger_get_Enabled(daily_trigger, NULL); + ok(hr == E_POINTER, "get_Enabled failed: %08x\n", hr); + + enabled = VARIANT_FALSE; + hr = IDailyTrigger_get_Enabled(daily_trigger, &enabled); + ok(hr == S_OK, "get_Enabled failed: %08x\n", hr); + ok(enabled == VARIANT_TRUE, "got %d\n", enabled); + + hr = IDailyTrigger_put_Enabled(daily_trigger, VARIANT_FALSE); ok(hr == S_OK, "put_Enabled failed: %08x\n", hr); + enabled = VARIANT_TRUE; + hr = IDailyTrigger_get_Enabled(daily_trigger, &enabled); + ok(hr == S_OK, "get_Enabled failed: %08x\n", hr); + ok(enabled == VARIANT_FALSE, "got %d\n", enabled); + IDailyTrigger_Release(daily_trigger); } -- 2.11.0

1 0

[PATCH 4/5] taskschd: Implement IDailyTrigger_get_StartBoundary.
by Hans Leidekker Dec. 1, 2017

Dec. 1, 2017

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 11 +++++++++-- dlls/taskschd/tests/scheduler.c | 17 +++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 84e84913fc..d720d50f87 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -182,8 +182,15 @@ static HRESULT WINAPI DailyTrigger_put_ExecutionTimeLimit(IDailyTrigger *iface, static HRESULT WINAPI DailyTrigger_get_StartBoundary(IDailyTrigger *iface, BSTR *start) { DailyTrigger *This = impl_from_IDailyTrigger(iface); - FIXME("(%p)->(%p)\n", This, start); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, start); + + if (!start) return E_POINTER; + + if (!This->start_boundary) *start = NULL; + else if (!(*start = SysAllocString(This->start_boundary))) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI DailyTrigger_put_StartBoundary(IDailyTrigger *iface, BSTR start) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 0f3010e30f..a9bf615dc3 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1228,14 +1228,31 @@ static void test_daily_trigger(ITrigger *trigger) ok(hr == S_OK, "get_DaysInterval failed: %08x\n", hr); ok(interval == 2, "interval = %d\n", interval); + hr = IDailyTrigger_get_StartBoundary(daily_trigger, NULL); + ok(hr == E_POINTER, "get_StartBoundary failed: %08x\n", hr); + + start_boundary = (BSTR)0xdeadbeef; + hr = IDailyTrigger_get_StartBoundary(daily_trigger, &start_boundary); + ok(hr == S_OK, "get_StartBoundary failed: %08x\n", hr); + ok(start_boundary == NULL, "start_boundary not set\n"); + start_boundary = SysAllocString(startW); hr = IDailyTrigger_put_StartBoundary(daily_trigger, start_boundary); ok(hr == S_OK, "put_StartBoundary failed: %08x\n", hr); SysFreeString(start_boundary); + start_boundary = NULL; + hr = IDailyTrigger_get_StartBoundary(daily_trigger, &start_boundary); + ok(hr == S_OK, "get_StartBoundary failed: %08x\n", hr); + ok(start_boundary != NULL, "start_boundary not set\n"); + ok(!lstrcmpW(start_boundary, startW), "wrong string\n"); + hr = IDailyTrigger_put_StartBoundary(daily_trigger, NULL); ok(hr == S_OK, "put_StartBoundary failed: %08x\n", hr); + hr = IDailyTrigger_put_Enabled(daily_trigger, VARIANT_TRUE); + ok(hr == S_OK, "put_Enabled failed: %08x\n", hr); + IDailyTrigger_Release(daily_trigger); } -- 2.11.0

1 0

[PATCH 1/5] taskschd: Consistently check for allocation failure.
by Hans Leidekker Dec. 1, 2017

Dec. 1, 2017

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/folder_collection.c | 6 ++++- dlls/taskschd/task.c | 54 +++++++++++++++++++++------------------ 2 files changed, 34 insertions(+), 26 deletions(-) diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index 47c962015d..969baec831 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -236,7 +236,11 @@ HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **o folders->ITaskFolderCollection_iface.lpVtbl = &TaskFolderCollection_vtbl; folders->ref = 1; - folders->path = heap_strdupW(path); + if (!(folders->path = heap_strdupW(path))) + { + heap_free(folders); + return E_OUTOFMEMORY; + } folders->count = count; folders->list = list; *obj = &folders->ITaskFolderCollection_iface; diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index df75236d9d..9959f042a2 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -542,7 +542,9 @@ static HRESULT WINAPI RegistrationInfo_get_Description(IRegistrationInfo *iface, if (!description) return E_POINTER; - *description = SysAllocString(reginfo->description); + if (!reginfo->description) *description = NULL; + else if (!(*description = SysAllocString(reginfo->description))) return E_OUTOFMEMORY; + return S_OK; } @@ -568,7 +570,9 @@ static HRESULT WINAPI RegistrationInfo_get_Author(IRegistrationInfo *iface, BSTR if (!author) return E_POINTER; - *author = SysAllocString(reginfo->author); + if (!reginfo->author) *author = NULL; + else if (!(*author = SysAllocString(reginfo->author))) return E_OUTOFMEMORY; + return S_OK; } @@ -594,7 +598,9 @@ static HRESULT WINAPI RegistrationInfo_get_Version(IRegistrationInfo *iface, BST if (!version) return E_POINTER; - *version = SysAllocString(reginfo->version); + if (!reginfo->version) *version = NULL; + else if (!(*version = SysAllocString(reginfo->version))) return E_OUTOFMEMORY; + return S_OK; } @@ -620,7 +626,9 @@ static HRESULT WINAPI RegistrationInfo_get_Date(IRegistrationInfo *iface, BSTR * if (!date) return E_POINTER; - *date = SysAllocString(reginfo->date); + if (!reginfo->date) *date = NULL; + else if (!(*date = SysAllocString(reginfo->date))) return E_OUTOFMEMORY; + return S_OK; } @@ -646,7 +654,9 @@ static HRESULT WINAPI RegistrationInfo_get_Documentation(IRegistrationInfo *ifac if (!doc) return E_POINTER; - *doc = SysAllocString(reginfo->documentation); + if (!reginfo->documentation) *doc = NULL; + else if (!(*doc = SysAllocString(reginfo->documentation))) return E_OUTOFMEMORY; + return S_OK; } @@ -684,7 +694,9 @@ static HRESULT WINAPI RegistrationInfo_get_URI(IRegistrationInfo *iface, BSTR *u if (!uri) return E_POINTER; - *uri = SysAllocString(reginfo->uri); + if (!reginfo->uri) *uri = NULL; + else if (!(*uri = SysAllocString(reginfo->uri))) return E_OUTOFMEMORY; + return S_OK; } @@ -722,7 +734,9 @@ static HRESULT WINAPI RegistrationInfo_get_Source(IRegistrationInfo *iface, BSTR if (!source) return E_POINTER; - *source = SysAllocString(reginfo->source); + if (!reginfo->source) *source = NULL; + else if (!(*source = SysAllocString(reginfo->source))) return E_OUTOFMEMORY; + return S_OK; } @@ -921,8 +935,8 @@ static HRESULT WINAPI TaskSettings_get_RestartInterval(ITaskSettings *iface, BST return S_OK; } - *interval = SysAllocString(taskset->restart_interval); - if (!*interval) return E_OUTOFMEMORY; + if (!taskset->restart_interval) *interval = NULL; + else if (!(*interval = SysAllocString(taskset->restart_interval))) return E_OUTOFMEMORY; return S_OK; } @@ -1135,8 +1149,8 @@ static HRESULT WINAPI TaskSettings_get_ExecutionTimeLimit(ITaskSettings *iface, return S_OK; } - *limit = SysAllocString(taskset->execution_time_limit); - if (!*limit) return E_OUTOFMEMORY; + if (!taskset->execution_time_limit) *limit = NULL; + else if (!(*limit = SysAllocString(taskset->execution_time_limit))) return E_OUTOFMEMORY; return S_OK; } @@ -1187,14 +1201,8 @@ static HRESULT WINAPI TaskSettings_get_DeleteExpiredTaskAfter(ITaskSettings *ifa if (!delay) return E_POINTER; - if (!taskset->delete_expired_task_after) - { - *delay = NULL; - return S_OK; - } - - *delay = SysAllocString(taskset->delete_expired_task_after); - if (!*delay) return E_OUTOFMEMORY; + if (!taskset->delete_expired_task_after) *delay = NULL; + else if (!(*delay = SysAllocString(taskset->delete_expired_task_after))) return E_OUTOFMEMORY; return S_OK; } @@ -1746,13 +1754,9 @@ static HRESULT WINAPI ExecAction_get_Path(IExecAction *iface, BSTR *path) if (!path) return E_POINTER; - if (!action->path) - { - *path = NULL; - return S_OK; - } + if (!action->path) *path = NULL; + else if (!(*path = SysAllocString(action->path))) return E_OUTOFMEMORY; - if (!(*path = SysAllocString(action->path))) return E_OUTOFMEMORY; return S_OK; } -- 2.11.0

1 0

[PATCH 1/2] comctl32/tests: Some cleanup for SysLink tests
by Nikolay Sivov Dec. 1, 2017

Dec. 1, 2017

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/syslink.c | 75 ++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 48 deletions(-) diff --git a/dlls/comctl32/tests/syslink.c b/dlls/comctl32/tests/syslink.c index 94569d6f20..382c89d208 100644 --- a/dlls/comctl32/tests/syslink.c +++ b/dlls/comctl32/tests/syslink.c @@ -180,39 +180,44 @@ static HWND create_syslink(DWORD style, HWND parent) return hWndSysLink; } +static void test_create_syslink(void) +{ + HWND hWndSysLink; + LONG oldstyle; + + /* Create an invisible SysLink control */ + flush_sequences(sequences, NUM_MSG_SEQUENCE); + hWndSysLink = create_syslink(WS_CHILD | WS_TABSTOP, hWndParent); + ok(hWndSysLink != NULL, "Expected non NULL value (le %u)\n", GetLastError()); + flush_events(); + ok_sequence(sequences, SYSLINK_SEQ_INDEX, empty_wnd_seq, "create SysLink", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_create_syslink_wnd_seq, "create SysLink (parent)", TRUE); + + /* Make the SysLink control visible */ + flush_sequences(sequences, NUM_MSG_SEQUENCE); + oldstyle = GetWindowLongA(hWndSysLink, GWL_STYLE); + SetWindowLongA(hWndSysLink, GWL_STYLE, oldstyle | WS_VISIBLE); + RedrawWindow(hWndSysLink, NULL, NULL, RDW_INVALIDATE); + flush_events(); + ok_sequence(sequences, SYSLINK_SEQ_INDEX, visible_syslink_wnd_seq, "visible SysLink", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_visible_syslink_wnd_seq, "visible SysLink (parent)", TRUE); + + DestroyWindow(hWndSysLink); +} START_TEST(syslink) { ULONG_PTR ctx_cookie; - HANDLE hCtx; HMODULE hComctl32; - BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); - INITCOMMONCONTROLSEX iccex; - BOOL rc; - HWND hWndSysLink; - LONG oldstyle; POINT orig_pos; + HANDLE hCtx; if (!load_v6_module(&ctx_cookie, &hCtx)) return; /* LoadLibrary is needed. This file has no reference to functions in comctl32 */ hComctl32 = LoadLibraryA("comctl32.dll"); - pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); - if (!pInitCommonControlsEx) - { - win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); - return; - } - iccex.dwSize = sizeof(iccex); - iccex.dwICC = ICC_LINK_CLASS; - rc = pInitCommonControlsEx(&iccex); - ok(rc, "InitCommonControlsEx failed (le %u)\n", GetLastError()); - if (!rc) - { - skip("Could not register ICC_LINK_CLASS\n"); - return; - } + ok(hComctl32 != NULL, "Failed to load comctl32.dll.\n"); /* Move the cursor off the parent window */ GetCursorPos(&orig_pos); @@ -223,36 +228,10 @@ START_TEST(syslink) /* Create parent window */ hWndParent = create_parent_window(); ok(hWndParent != NULL, "Failed to create parent Window!\n"); - if (!hWndParent) - { - skip("Parent window not present\n"); - return; - } - flush_events(); - - /* Create an invisible SysLink control */ - flush_sequences(sequences, NUM_MSG_SEQUENCE); - hWndSysLink = create_syslink(WS_CHILD | WS_TABSTOP, hWndParent); - ok(hWndSysLink != NULL, "Expected non NULL value (le %u)\n", GetLastError()); - if (!hWndSysLink) - { - skip("SysLink control not present?\n"); - return; - } flush_events(); - ok_sequence(sequences, SYSLINK_SEQ_INDEX, empty_wnd_seq, "create SysLink", FALSE); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_create_syslink_wnd_seq, "create SysLink (parent)", TRUE); - /* Make the SysLink control visible */ - flush_sequences(sequences, NUM_MSG_SEQUENCE); - oldstyle = GetWindowLongA(hWndSysLink, GWL_STYLE); - SetWindowLongA(hWndSysLink, GWL_STYLE, oldstyle | WS_VISIBLE); - RedrawWindow(hWndSysLink, NULL, NULL, RDW_INVALIDATE); - flush_events(); - ok_sequence(sequences, SYSLINK_SEQ_INDEX, visible_syslink_wnd_seq, "visible SysLink", TRUE); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_visible_syslink_wnd_seq, "visible SysLink (parent)", TRUE); + test_create_syslink(); - DestroyWindow(hWndSysLink); DestroyWindow(hWndParent); unload_v6_module(ctx_cookie, hCtx); SetCursorPos(orig_pos.x, orig_pos.y); -- 2.15.0

1 1