April 2018 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : mstask/tests: Add some tests for trigger management.
by Alexandre Julliard April 24, 2018

April 24, 2018

Module: wine Branch: master Commit: fffed17f8057011adcb3e19e3833582a4d8ef649 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fffed17f8057011adcb3e19e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 24 16:14:05 2018 +0800 mstask/tests: Add some tests for trigger management. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/tests/task_trigger.c | 82 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 77 insertions(+), 5 deletions(-) diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index 0a68a19..a1b5597 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -2,6 +2,7 @@ * Test suite for Task interface * * Copyright (C) 2008 Google (Roy Shea) + * Copyright (C) 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 @@ -35,10 +36,6 @@ static BOOL setup_trigger(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) @@ -60,7 +57,6 @@ static void cleanup_trigger(void) { ITaskTrigger_Release(test_trigger); ITask_Release(test_task); - ITaskScheduler_Release(test_task_scheduler); } static BOOL compare_trigger_state(TASK_TRIGGER found_state, @@ -376,10 +372,86 @@ static void test_SetTrigger_GetTrigger(void) return; } +static void test_task_trigger(void) +{ + static const WCHAR task_name[] = { 'T','e','s','t','i','n','g',0 }; + HRESULT hr; + ITask *task; + ITaskTrigger *trigger, *trigger2; + 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); + + count = 0xdead; + hr = ITask_GetTriggerCount(task, &count); + ok(hr == S_OK, "got %#x\n", hr); + ok(count == 0, "got %u\n", count); + + hr = ITask_DeleteTrigger(task, 0); + ok(hr == SCHED_E_TRIGGER_NOT_FOUND, "got %#x\n", hr); + + hr = ITask_GetTrigger(task, 0, &trigger); + ok(hr == SCHED_E_TRIGGER_NOT_FOUND, "got %#x\n", hr); + + idx = 0xdead; + hr = ITask_CreateTrigger(task, &idx, &trigger); + ok(hr == S_OK, "got %#x\n", hr); + ok(idx == 0, "got %u\n", idx); + + hr = ITask_GetTrigger(task, 0, &trigger2); + ok(hr == S_OK, "got %#x\n", hr); + ok(trigger != trigger2, "%p != %p\n", trigger, trigger2); + + ref = ITaskTrigger_Release(trigger2); + ok(ref == 0, "got %u\n", ref); + + ref = ITaskTrigger_Release(trigger); + ok(ref == 0, "got %u\n", ref); + + count = 0xdead; + hr = ITask_GetTriggerCount(task, &count); + ok(hr == S_OK, "got %#x\n", hr); + ok(count == 1, "got %u\n", count); + + hr = ITask_DeleteTrigger(task, 0); + ok(hr == S_OK, "got %#x\n", hr); + + idx = 0xdead; + hr = ITask_CreateTrigger(task, &idx, &trigger); + ok(hr == S_OK, "got %#x\n", hr); + ok(idx == 0, "got %u\n", idx); + + hr = ITask_DeleteTrigger(task, 0); + ok(hr == S_OK, "got %#x\n", hr); + + count = 0xdead; + hr = ITask_GetTriggerCount(task, &count); + ok(hr == S_OK, "got %#x\n", hr); + ok(count == 0, "got %u\n", count); + + ref = ITaskTrigger_Release(trigger); + ok(ref == 0, "got %u\n", ref); + + ref = ITask_Release(task); + ok(ref == 0, "got %u\n", ref); +} START_TEST(task_trigger) { + HRESULT hr; + CoInitialize(NULL); + + hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, + &IID_ITaskScheduler, (void **)&test_task_scheduler); + ok(hr == S_OK, "error creating TaskScheduler instance %#x\n", hr); + test_SetTrigger_GetTrigger(); + test_task_trigger(); + + ITaskScheduler_Release(test_task_scheduler); CoUninitialize(); }

1 0

Dmitry Timoshkov : mstask: Implement ITask::DeleteTrigger().
by Alexandre Julliard April 24, 2018

April 24, 2018

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

Louis Lenders : winmm: Return error in waveOutMessage if either dwParam1 or dwParam2 is null.
by Alexandre Julliard April 24, 2018

April 24, 2018

Module: wine Branch: master Commit: d7bd861ae6d3ec24ff69def9ab7115ebb13d554d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7bd861ae6d3ec24ff69def9… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Apr 24 11:52:18 2018 +0200 winmm: Return error in waveOutMessage if either dwParam1 or dwParam2 is null. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/wave.c | 10 ++++++++++ dlls/winmm/waveform.c | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 2a12752..8d7dfd6 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1440,6 +1440,16 @@ static void wave_out_tests(void) ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) || preferred < ndev, "Got invalid preferred device: 0x%x\n", preferred); + rc = waveOutMessage((HWAVEOUT)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, + (DWORD_PTR)-1 , 0); + ok(rc == MMSYSERR_INVALPARAM || rc == MMSYSERR_BADDEVICEID, /* w2008+wvista */ + "waveOutMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc); + + rc = waveOutMessage((HWAVEOUT)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, + 0, (DWORD_PTR)&status); + ok(rc == MMSYSERR_INVALPARAM || rc == MMSYSERR_BADDEVICEID, /* w2008+wvista */ + "waveOutMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc); + rc=waveOutGetDevCapsA(ndev+1,&capsA,sizeof(capsA)); ok(rc==MMSYSERR_BADDEVICEID, "waveOutGetDevCapsA(%s): MMSYSERR_BADDEVICEID expected, got %s\n", diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 7308519..26fed17 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -3262,17 +3262,17 @@ UINT WINAPI waveOutMessage(HWAVEOUT hWaveOut, UINT uMessage, case DRV_QUERYMAPPABLE: return MMSYSERR_NOERROR; case DRVM_MAPPER_PREFERRED_GET: - if(dwParam1) { - if(g_outmmdevices_count > 0) - /* Device 0 is always the default device */ - *(DWORD *)dwParam1 = 0; - else - *(DWORD *)dwParam1 = -1; - } + if(!dwParam1 || !dwParam2) + return MMSYSERR_INVALPARAM; - if(dwParam2) - /* Status flags */ - *(DWORD *)dwParam2 = 0; + if(g_outmmdevices_count > 0) + /* Device 0 is always the default device */ + *(DWORD *)dwParam1 = 0; + else + *(DWORD *)dwParam1 = -1; + + /* Status flags */ + *(DWORD *)dwParam2 = 0; return MMSYSERR_NOERROR; }

1 0

Dmitry Timoshkov : mstask: Implement ITask::GetTriggerCount().
by Alexandre Julliard April 24, 2018

April 24, 2018

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

Owen Rudge : wsdapi: Build and write Types list for Hello message.
by Alexandre Julliard April 24, 2018

April 24, 2018

Module: wine Branch: master Commit: e32fa5ce070bea83fd529f60aac4a643bcc98731 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e32fa5ce070bea83fd529f60… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Apr 23 21:12:11 2018 +0100 wsdapi: Build and write Types list for 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 | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index af77604..911fbd2 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -77,6 +77,7 @@ static const WCHAR bodyString[] = { 'B','o','d','y', 0 }; static const WCHAR helloString[] = { 'H','e','l','l','o', 0 }; static const WCHAR endpointReferenceString[] = { 'E','n','d','p','o','i','n','t','R','e','f','e','r','e','n','c','e', 0 }; static const WCHAR addressString[] = { 'A','d','d','r','e','s','s', 0 }; +static const WCHAR typesString[] = { 'T','y','p','e','s', 0 }; struct discovered_namespace { @@ -499,6 +500,38 @@ static BOOL add_discovered_namespace(struct list *namespaces, WSDXML_NAMESPACE * return TRUE; } +static HRESULT build_types_list(LPWSTR buffer, size_t buffer_size, const WSD_NAME_LIST *list, struct list *namespaces) +{ + WCHAR format_string[] = { '%', 's', ':', '%', 's', 0 }; + LPWSTR current_buf_pos = buffer; + size_t memory_needed = 0; + const WSD_NAME_LIST *cur = list; + + do + { + /* Calculate space needed, including NULL character, colon and potential trailing space */ + memory_needed = sizeof(WCHAR) * (lstrlenW(cur->Element->LocalName) + + lstrlenW(cur->Element->Space->PreferredPrefix) + 3); + + if (current_buf_pos + memory_needed > buffer + buffer_size) + return E_INVALIDARG; + + if (cur != list) + *current_buf_pos++ = ' '; + + current_buf_pos += wsprintfW(current_buf_pos, format_string, cur->Element->Space->PreferredPrefix, + cur->Element->LocalName); + + /* Record the namespace in the discovered namespaces list */ + if (!add_discovered_namespace(namespaces, cur->Element->Space)) + return E_FAIL; + + cur = cur->Next; + } while (cur != NULL); + + return S_OK; +} + static HRESULT duplicate_element(WSDXML_ELEMENT *parent, const WSDXML_ELEMENT *node, struct list *namespaces) { WSDXML_ATTRIBUTE *cur_attribute, *new_attribute, *last_attribute = NULL; @@ -827,6 +860,7 @@ HRESULT send_hello_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLON WSD_APP_SEQUENCE sequence; WCHAR message_id[64]; HRESULT ret = E_OUTOFMEMORY; + LPWSTR buffer; sequence.InstanceId = instance_id; sequence.MessageNumber = msg_num; @@ -866,6 +900,19 @@ HRESULT send_hello_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLON if (FAILED(ret)) goto cleanup; } + /* <wsd:Types> */ + if (types_list != NULL) + { + buffer = WSDAllocateLinkedMemory(hello_element, WSD_MAX_TEXT_LENGTH * sizeof(WCHAR)); + if (buffer == NULL) goto failed; + + ret = build_types_list(buffer, WSD_MAX_TEXT_LENGTH * sizeof(WCHAR), types_list, discoveredNamespaces); + if (FAILED(ret)) goto cleanup; + + ret = add_child_element(impl->xmlContext, hello_element, discoveryNsUri, typesString, buffer, NULL); + if (FAILED(ret)) goto cleanup; + } + /* Write any body elements */ if (any != NULL) {

1 0

Dmitry Timoshkov : mstask: Fix saving the triggers.
by Alexandre Julliard April 24, 2018

April 24, 2018

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

Owen Rudge : wsdapi/tests: Add test for endpoint reference "any" parameter.
by Alexandre Julliard April 24, 2018

April 24, 2018

Module: wine Branch: master Commit: e7a5fc50dcfbab8cc055b84882bdfd4a5e351877 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7a5fc50dcfbab8cc055b848… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Apr 23 21:12:07 2018 +0100 wsdapi/tests: Add test for endpoint reference "any" parameter. 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/tests/discovery.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index c7fe8cf..3d88207 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -513,12 +513,13 @@ static void Publish_tests(void) HRESULT rc; ULONG ref; char *msg; - WSDXML_ELEMENT *header_any_element, *body_any_element; + WSDXML_ELEMENT *header_any_element, *body_any_element, *endpoint_any_element; WSDXML_NAME header_any_name; WSDXML_NAMESPACE ns; WCHAR header_any_name_text[] = {'B','e','e','r',0}; static const WCHAR header_any_text[] = {'P','u','b','l','i','s','h','T','e','s','t',0}; static const WCHAR body_any_text[] = {'B','o','d','y','T','e','s','t',0}; + static const WCHAR endpoint_any_text[] = {'E','n','d','P','T','e','s','t',0}; static const WCHAR uri[] = {'h','t','t','p',':','/','/','w','i','n','e','.','t','e','s','t','/',0}; static const WCHAR prefix[] = {'w','i','n','e',0}; @@ -595,12 +596,16 @@ static void Publish_tests(void) rc = WSDXMLBuildAnyForSingleElement(&header_any_name, body_any_text, &body_any_element); ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + rc = WSDXMLBuildAnyForSingleElement(&header_any_name, endpoint_any_text, &endpoint_any_element); + ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + /* Publish the service */ rc = IWSDiscoveryPublisher_PublishEx(publisher, publisherIdW, 1, 1, 1, sequenceIdW, NULL, NULL, NULL, - header_any_element, NULL, NULL, NULL, body_any_element); + header_any_element, NULL, NULL, endpoint_any_element, body_any_element); WSDFreeLinkedMemory(header_any_element); WSDFreeLinkedMemory(body_any_element); + WSDFreeLinkedMemory(endpoint_any_element); ok(rc == S_OK, "Publish failed: %08x\n", rc); @@ -617,7 +622,7 @@ static void Publish_tests(void) /* Verify we've received a message */ ok(msgStorage->messageCount >= 1, "No messages received\n"); - sprintf(endpointReferenceString, "<wsa:EndpointReference><wsa:Address>%s</wsa:Address></wsa:EndpointReference>", publisherId); + sprintf(endpointReferenceString, "<wsa:EndpointReference><wsa:Address>%s</wsa:Address><wine:Beer>EndPTest</wine:Beer></wsa:EndpointReference>", publisherId); sprintf(app_sequence_string, "<wsd:AppSequence InstanceId=\"1\" SequenceId=\"%s\" MessageNumber=\"1\"></wsd:AppSequence>", sequenceId);

1 0

Dmitry Timoshkov : mstask: Save a task with at least 1 trigger to follow the .job file spec.
by Alexandre Julliard April 24, 2018

April 24, 2018

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

Owen Rudge : wsdapi: Build and write Scopes and XAddrs lists for Hello message.
by Alexandre Julliard April 24, 2018

April 24, 2018

Module: wine Branch: master Commit: 68095318b6093ceda6ba16197525f6c5ef794bb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68095318b6093ceda6ba1619… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Apr 23 21:12:23 2018 +0100 wsdapi: Build and write Scopes and XAddrs lists for 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 | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 911fbd2..9ba934e 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -78,6 +78,8 @@ static const WCHAR helloString[] = { 'H','e','l','l','o', 0 }; static const WCHAR endpointReferenceString[] = { 'E','n','d','p','o','i','n','t','R','e','f','e','r','e','n','c','e', 0 }; 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 }; struct discovered_namespace { @@ -532,6 +534,33 @@ static HRESULT build_types_list(LPWSTR buffer, size_t buffer_size, const WSD_NAM return S_OK; } +static HRESULT build_uri_list(LPWSTR buffer, size_t buffer_size, const WSD_URI_LIST *list) +{ + size_t memory_needed = 0, string_len = 0; + const WSD_URI_LIST *cur = list; + LPWSTR cur_buf_pos = buffer; + + do + { + /* Calculate space needed, including trailing space */ + string_len = lstrlenW(cur->Element); + memory_needed = (string_len + 1) * sizeof(WCHAR); + + if (cur_buf_pos + memory_needed > buffer + buffer_size) + return E_INVALIDARG; + + if (cur != list) + *cur_buf_pos++ = ' '; + + memcpy(cur_buf_pos, cur->Element, memory_needed); + cur_buf_pos += string_len; + + cur = cur->Next; + } while (cur != NULL); + + return S_OK; +} + static HRESULT duplicate_element(WSDXML_ELEMENT *parent, const WSDXML_ELEMENT *node, struct list *namespaces) { WSDXML_ATTRIBUTE *cur_attribute, *new_attribute, *last_attribute = NULL; @@ -913,6 +942,32 @@ HRESULT send_hello_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLON if (FAILED(ret)) goto cleanup; } + /* <wsd:Scopes> */ + if (scopes_list != NULL) + { + buffer = WSDAllocateLinkedMemory(hello_element, WSD_MAX_TEXT_LENGTH * sizeof(WCHAR)); + if (buffer == NULL) goto failed; + + ret = build_uri_list(buffer, WSD_MAX_TEXT_LENGTH * sizeof(WCHAR), scopes_list); + if (FAILED(ret)) goto cleanup; + + ret = add_child_element(impl->xmlContext, hello_element, discoveryNsUri, scopesString, buffer, NULL); + if (FAILED(ret)) goto cleanup; + } + + /* <wsd:XAddrs> */ + if (xaddrs_list != NULL) + { + buffer = WSDAllocateLinkedMemory(hello_element, WSD_MAX_TEXT_LENGTH * sizeof(WCHAR)); + if (buffer == NULL) goto failed; + + ret = build_uri_list(buffer, WSD_MAX_TEXT_LENGTH * sizeof(WCHAR), xaddrs_list); + if (FAILED(ret)) goto cleanup; + + ret = add_child_element(impl->xmlContext, hello_element, discoveryNsUri, xAddrsString, buffer, NULL); + if (FAILED(ret)) goto cleanup; + } + /* Write any body elements */ if (any != NULL) {

1 0

Dmitry Timoshkov : schedsvc: Print an error if the service couldn' t start monitoring the tasks directory.
by Alexandre Julliard April 24, 2018

April 24, 2018

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