February 2014 - Wine-commits

Dmitry Timoshkov : taskschd: Add initial version of the task definition XML writer.
by Alexandre Julliard 22 Feb '14

22 Feb '14

Module: wine Branch: master Commit: 890bff26228ce1ce77519c6f29b9f1bde2307ecf URL: http://source.winehq.org/git/wine.git/?a=commit;h=890bff26228ce1ce77519c6f2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 21 11:35:26 2014 +0900 taskschd: Add initial version of the task definition XML writer. --- dlls/taskschd/task.c | 254 +++++++++++++++++++++++++++++++++++++-- dlls/taskschd/tests/scheduler.c | 2 - 2 files changed, 246 insertions(+), 10 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index f23a7ad..e1fc713 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -529,7 +529,7 @@ static HRESULT WINAPI TaskSettings_get_XmlText(ITaskSettings *iface, BSTR *xml) static HRESULT WINAPI TaskSettings_put_XmlText(ITaskSettings *iface, BSTR xml) { - TRACE("%p,%s\n", iface, debugstr_w(xml)); + FIXME("%p,%s: stub\n", iface, debugstr_w(xml)); return E_NOTIMPL; } @@ -832,9 +832,12 @@ static HRESULT TaskSettings_create(ITaskSettings **obj) typedef struct { ITaskDefinition ITaskDefinition_iface; + LONG ref; IRegistrationInfo *reginfo; ITaskSettings *taskset; - LONG ref; + ITriggerCollection *triggers; + IPrincipal *principal; + IActionCollection *actions; } TaskDefinition; static inline TaskDefinition *impl_from_ITaskDefinition(ITaskDefinition *iface) @@ -856,10 +859,18 @@ static ULONG WINAPI TaskDefinition_Release(ITaskDefinition *iface) if (!ref) { TRACE("destroying %p\n", iface); + if (taskdef->reginfo) IRegistrationInfo_Release(taskdef->reginfo); if (taskdef->taskset) ITaskSettings_Release(taskdef->taskset); + if (taskdef->triggers) + ITriggerCollection_Release(taskdef->triggers); + if (taskdef->principal) + IPrincipal_Release(taskdef->principal); + if (taskdef->actions) + IActionCollection_Release(taskdef->actions); + heap_free(taskdef); } @@ -1037,12 +1048,6 @@ static HRESULT WINAPI TaskDefinition_put_Actions(ITaskDefinition *iface, IAction return E_NOTIMPL; } -static HRESULT WINAPI TaskDefinition_get_XmlText(ITaskDefinition *iface, BSTR *xml) -{ - FIXME("%p,%p: stub\n", iface, xml); - return E_NOTIMPL; -} - static const WCHAR Task[] = {'T','a','s','k',0}; static const WCHAR version[] = {'v','e','r','s','i','o','n',0}; static const WCHAR v1_0[] = {'1','.','0',0}; @@ -1065,6 +1070,7 @@ static const WCHAR InteractiveToken[] = {'I','n','t','e','r','a','c','t','i','v' static const WCHAR RunLevel[] = {'R','u','n','L','e','v','e','l',0}; static const WCHAR LeastPrivilege[] = {'L','e','a','s','t','P','r','i','v','i','l','e','g','e',0}; static const WCHAR Actions[] = {'A','c','t','i','o','n','s',0}; +static const WCHAR Exec[] = {'E','x','e','c',0}; static const WCHAR MultipleInstancesPolicy[] = {'M','u','l','t','i','p','l','e','I','n','s','t','a','n','c','e','s','P','o','l','i','c','y',0}; static const WCHAR IgnoreNew[] = {'I','g','n','o','r','e','N','e','w',0}; static const WCHAR DisallowStartIfOnBatteries[] = {'D','i','s','a','l','l','o','w','S','t','a','r','t','I','f','O','n','B','a','t','t','e','r','i','e','s',0}; @@ -1081,6 +1087,238 @@ static const WCHAR ExecutionTimeLimit[] = {'E','x','e','c','u','t','i','o','n',' static const WCHAR Priority[] = {'P','r','i','o','r','i','t','y',0}; static const WCHAR IdleSettings[] = {'I','d','l','e','S','e','t','t','i','n','g','s',0}; +static int xml_indent; + +static inline void push_indent(void) +{ + xml_indent += 2; +} + +static inline void pop_indent(void) +{ + xml_indent -= 2; +} + +static inline HRESULT write_stringW(IStream *stream, const WCHAR *str) +{ + return IStream_Write(stream, str, lstrlenW(str) * sizeof(WCHAR), NULL); +} + +static void write_indent(IStream *stream) +{ + static const WCHAR spacesW[] = {' ',' ',0}; + int i; + for (i = 0; i < xml_indent; i += 2) + write_stringW(stream, spacesW); +} + +static const WCHAR start_element[] = {'<',0}; +static const WCHAR start_end_element[] = {'<','/',0}; +static const WCHAR close_element[] = {'>',0}; +static const WCHAR end_empty_element[] = {'/','>',0}; +static const WCHAR eol[] = {'\n',0}; + +static inline HRESULT write_empty_element(IStream *stream, const WCHAR *name) +{ + write_indent(stream); + write_stringW(stream, start_element); + write_stringW(stream, name); + write_stringW(stream, end_empty_element); + return write_stringW(stream, eol); +} + +static inline HRESULT write_element(IStream *stream, const WCHAR *name) +{ + write_indent(stream); + write_stringW(stream, start_element); + write_stringW(stream, name); + write_stringW(stream, close_element); + return write_stringW(stream, eol); +} + +static inline HRESULT write_element_end(IStream *stream, const WCHAR *name) +{ + write_indent(stream); + write_stringW(stream, start_end_element); + write_stringW(stream, name); + write_stringW(stream, close_element); + return write_stringW(stream, eol); +} + +static inline HRESULT write_text_value(IStream *stream, const WCHAR *name, const WCHAR *value) +{ + write_indent(stream); + write_stringW(stream, start_element); + write_stringW(stream, name); + write_stringW(stream, close_element); + write_stringW(stream, value); + write_stringW(stream, start_end_element); + write_stringW(stream, name); + write_stringW(stream, close_element); + return write_stringW(stream, eol); +} + +static HRESULT write_task_attributes(IStream *stream, ITaskDefinition *taskdef) +{ + static const WCHAR spaceW[] = {' ',0}; + static const WCHAR equalW[] = {'=',0}; + static const WCHAR quoteW[] = {'"',0}; + HRESULT hr; + ITaskSettings *taskset; + TASK_COMPATIBILITY level; + const WCHAR *compatibility; + + hr = ITaskDefinition_get_Settings(taskdef, &taskset); + if (hr != S_OK) return hr; + + hr = ITaskSettings_get_Compatibility(taskset, &level); + if (hr != S_OK) level = TASK_COMPATIBILITY_V2_1; + + ITaskSettings_Release(taskset); + + switch (level) + { + case TASK_COMPATIBILITY_AT: + compatibility = v1_0; + break; + case TASK_COMPATIBILITY_V1: + compatibility = v1_1; + break; + case TASK_COMPATIBILITY_V2: + compatibility = v1_2; + break; + default: + compatibility = v1_3; + break; + } + + write_stringW(stream, start_element); + write_stringW(stream, Task); + write_stringW(stream, spaceW); + write_stringW(stream, version); + write_stringW(stream, equalW); + write_stringW(stream, quoteW); + write_stringW(stream, compatibility); + write_stringW(stream, quoteW); + write_stringW(stream, spaceW); + write_stringW(stream, xmlns); + write_stringW(stream, equalW); + write_stringW(stream, quoteW); + write_stringW(stream, task_ns); + write_stringW(stream, quoteW); + write_stringW(stream, close_element); + return write_stringW(stream, eol); +} + +static HRESULT write_registration_info(IStream *stream, IRegistrationInfo *reginfo) +{ + if (!reginfo) + return write_empty_element(stream, RegistrationInfo); + + FIXME("stub\n"); + return S_OK; +} + +static HRESULT write_principal(IStream *stream, IPrincipal *principal) +{ + if (!principal) + return write_empty_element(stream, Principals); + + FIXME("stub\n"); + return S_OK; +} + +static HRESULT write_settings(IStream *stream, ITaskSettings *settings) +{ + if (!settings) + return write_empty_element(stream, Settings); + + FIXME("stub\n"); + return S_OK; +} + +static HRESULT write_triggers(IStream *stream, ITriggerCollection *triggers) +{ + if (!triggers) + return write_empty_element(stream, Triggers); + + FIXME("stub\n"); + return S_OK; +} + +static HRESULT write_actions(IStream *stream, IActionCollection *actions) +{ + if (!actions) + { + write_element(stream, Actions); + push_indent(); + write_empty_element(stream, Exec); + pop_indent(); + return write_element_end(stream, Actions); + } + + FIXME("stub\n"); + return S_OK; +} + +static HRESULT WINAPI TaskDefinition_get_XmlText(ITaskDefinition *iface, BSTR *xml) +{ + TaskDefinition *taskdef = impl_from_ITaskDefinition(iface); + HRESULT hr; + IStream *stream; + HGLOBAL hmem; + void *p; + + TRACE("%p,%p\n", iface, xml); + + hmem = GlobalAlloc(GMEM_MOVEABLE | GMEM_NODISCARD, 16); + if (!hmem) return E_OUTOFMEMORY; + + hr = CreateStreamOnHGlobal(hmem, TRUE, &stream); + if (hr != S_OK) + { + GlobalFree(hmem); + return hr; + } + + hr = write_task_attributes(stream, &taskdef->ITaskDefinition_iface); + if (hr != S_OK) goto failed; + + push_indent(); + + hr = write_registration_info(stream, taskdef->reginfo); + if (hr != S_OK) goto failed; + + hr = write_triggers(stream, taskdef->triggers); + if (hr != S_OK) goto failed; + + hr = write_principal(stream, taskdef->principal); + if (hr != S_OK) goto failed; + + hr = write_settings(stream, taskdef->taskset); + if (hr != S_OK) goto failed; + + hr = write_actions(stream, taskdef->actions); + if (hr != S_OK) goto failed; + + pop_indent(); + + write_element_end(stream, Task); + IStream_Write(stream, "\0\0", 2, NULL); + + p = GlobalLock(hmem); + *xml = SysAllocString(p); + GlobalUnlock(hmem); + + IStream_Release(stream); + + return *xml ? S_OK : E_OUTOFMEMORY; + +failed: + IStream_Release(stream); + return hr; +} + static HRESULT read_text_value(IXmlReader *reader, WCHAR **value) { HRESULT hr; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 83f5367..34e4625 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1112,7 +1112,6 @@ static void test_TaskDefinition(void) create_action(taskdef); hr = ITaskDefinition_get_XmlText(taskdef, &xml); -todo_wine ok(hr == S_OK, "get_XmlText error %#x\n", hr); ITaskDefinition_Release(taskdef); @@ -1121,7 +1120,6 @@ todo_wine ok(hr == S_OK, "NewTask error %#x\n", hr); hr = ITaskDefinition_put_XmlText(taskdef, xml); -todo_wine ok(hr == S_OK, "put_XmlText error %#x\n", hr); SysFreeString(xml);

1 0

Dmitry Timoshkov : taskschd: Add support for RegistrationInfo to task definition XML writer.
by Alexandre Julliard 22 Feb '14

22 Feb '14

Module: wine Branch: master Commit: c6a01c42c970614d628d93a0a2bb6327b6e7a4d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a01c42c970614d628d93a0a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 21 11:35:30 2014 +0900 taskschd: Add support for RegistrationInfo to task definition XML writer. --- dlls/taskschd/task.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index e1fc713..002d25d 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1059,6 +1059,12 @@ static const WCHAR task_ns[] = {'h','t','t','p',':','/','/','s','c','h','e','m', static const WCHAR RegistrationInfo[] = {'R','e','g','i','s','t','r','a','t','i','o','n','I','n','f','o',0}; static const WCHAR Author[] = {'A','u','t','h','o','r',0}; static const WCHAR Description[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; +static const WCHAR Source[] = {'S','o','u','r','c','e',0}; +static const WCHAR Date[] = {'D','a','t','e',0}; +static const WCHAR Version[] = {'V','e','r','s','i','o','n',0}; +static const WCHAR Documentation[] = {'D','o','c','u','m','e','n','t','a','t','i','o','n',0}; +static const WCHAR URI[] = {'U','R','I',0}; +static const WCHAR SecurityDescriptor[] = {'S','e','c','u','r','i','t','y','D','e','s','c','r','i','p','t','o','r',0}; static const WCHAR Settings[] = {'S','e','t','t','i','n','g','s',0}; static const WCHAR Triggers[] = {'T','r','i','g','g','e','r','s',0}; static const WCHAR Principals[] = {'P','r','i','n','c','i','p','a','l','s',0}; @@ -1212,11 +1218,83 @@ static HRESULT write_task_attributes(IStream *stream, ITaskDefinition *taskdef) static HRESULT write_registration_info(IStream *stream, IRegistrationInfo *reginfo) { + HRESULT hr; + BSTR bstr; + VARIANT var; + if (!reginfo) return write_empty_element(stream, RegistrationInfo); - FIXME("stub\n"); - return S_OK; + hr = write_element(stream, RegistrationInfo); + if (hr != S_OK) return hr; + + push_indent(); + + hr = IRegistrationInfo_get_Source(reginfo, &bstr); + if (hr == S_OK) + { + hr = write_text_value(stream, Source, bstr); + SysFreeString(bstr); + if (hr != S_OK) return hr; + } + hr = IRegistrationInfo_get_Date(reginfo, &bstr); + if (hr == S_OK) + { + hr = write_text_value(stream, Date, bstr); + SysFreeString(bstr); + if (hr != S_OK) return hr; + } + hr = IRegistrationInfo_get_Author(reginfo, &bstr); + if (hr == S_OK) + { + hr = write_text_value(stream, Author, bstr); + SysFreeString(bstr); + if (hr != S_OK) return hr; + } + hr = IRegistrationInfo_get_Version(reginfo, &bstr); + if (hr == S_OK) + { + hr = write_text_value(stream, Version, bstr); + SysFreeString(bstr); + if (hr != S_OK) return hr; + } + hr = IRegistrationInfo_get_Description(reginfo, &bstr); + if (hr == S_OK) + { + hr = write_text_value(stream, Description, bstr); + SysFreeString(bstr); + if (hr != S_OK) return hr; + } + hr = IRegistrationInfo_get_Documentation(reginfo, &bstr); + if (hr == S_OK) + { + hr = write_text_value(stream, Documentation, bstr); + SysFreeString(bstr); + if (hr != S_OK) return hr; + } + hr = IRegistrationInfo_get_URI(reginfo, &bstr); + if (hr == S_OK) + { + hr = write_text_value(stream, URI, bstr); + SysFreeString(bstr); + if (hr != S_OK) return hr; + } + hr = IRegistrationInfo_get_SecurityDescriptor(reginfo, &var); + if (hr == S_OK) + { + if (V_VT(&var) == VT_BSTR) + { + hr = write_text_value(stream, SecurityDescriptor, V_BSTR(&var)); + VariantClear(&var); + if (hr != S_OK) return hr; + } + else + FIXME("SecurityInfo variant type %d is not supported\n", V_VT(&var)); + } + + pop_indent(); + + return write_element_end(stream, RegistrationInfo); } static HRESULT write_principal(IStream *stream, IPrincipal *principal)

1 0

Dmitry Timoshkov : taskschd: Add support for Principals to task definition XML writer.
by Alexandre Julliard 22 Feb '14

22 Feb '14

Module: wine Branch: master Commit: 67ad1d85acb1ed4d471c6653ade36b91f8c18845 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67ad1d85acb1ed4d471c6653a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 21 11:35:34 2014 +0900 taskschd: Add support for Principals to task definition XML writer. --- dlls/taskschd/task.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 117 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 002d25d..489ade3 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1072,6 +1072,11 @@ static const WCHAR Principal[] = {'P','r','i','n','c','i','p','a','l',0}; static const WCHAR id[] = {'i','d',0}; static const WCHAR UserId[] = {'U','s','e','r','I','d',0}; static const WCHAR LogonType[] = {'L','o','g','o','n','T','y','p','e',0}; +static const WCHAR GroupId[] = {'G','r','o','u','p','I','d',0}; +static const WCHAR DisplayName[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; +static const WCHAR HighestAvailable[] = {'H','i','g','h','e','s','t','A','v','a','i','l','a','b','l','e',0}; +static const WCHAR Password[] = {'P','a','s','s','w','o','r','d',0}; +static const WCHAR S4U[] = {'S','4','U',0}; static const WCHAR InteractiveToken[] = {'I','n','t','e','r','a','c','t','i','v','e','T','o','k','e','n',0}; static const WCHAR RunLevel[] = {'R','u','n','L','e','v','e','l',0}; static const WCHAR LeastPrivilege[] = {'L','e','a','s','t','P','r','i','v','i','l','e','g','e',0}; @@ -1123,6 +1128,9 @@ static const WCHAR start_end_element[] = {'<','/',0}; static const WCHAR close_element[] = {'>',0}; static const WCHAR end_empty_element[] = {'/','>',0}; static const WCHAR eol[] = {'\n',0}; +static const WCHAR spaceW[] = {' ',0}; +static const WCHAR equalW[] = {'=',0}; +static const WCHAR quoteW[] = {'"',0}; static inline HRESULT write_empty_element(IStream *stream, const WCHAR *name) { @@ -1166,9 +1174,6 @@ static inline HRESULT write_text_value(IStream *stream, const WCHAR *name, const static HRESULT write_task_attributes(IStream *stream, ITaskDefinition *taskdef) { - static const WCHAR spaceW[] = {' ',0}; - static const WCHAR equalW[] = {'=',0}; - static const WCHAR quoteW[] = {'"',0}; HRESULT hr; ITaskSettings *taskset; TASK_COMPATIBILITY level; @@ -1299,11 +1304,118 @@ static HRESULT write_registration_info(IStream *stream, IRegistrationInfo *regin static HRESULT write_principal(IStream *stream, IPrincipal *principal) { + HRESULT hr; + BSTR bstr; + TASK_LOGON_TYPE logon; + TASK_RUNLEVEL_TYPE level; + if (!principal) return write_empty_element(stream, Principals); - FIXME("stub\n"); - return S_OK; + hr = write_element(stream, Principals); + if (hr != S_OK) return hr; + + push_indent(); + + hr = IPrincipal_get_Id(principal, &bstr); + if (hr == S_OK) + { + write_indent(stream); + write_stringW(stream, start_element); + write_stringW(stream, Principal); + write_stringW(stream, spaceW); + write_stringW(stream, id); + write_stringW(stream, equalW); + write_stringW(stream, quoteW); + write_stringW(stream, bstr); + write_stringW(stream, quoteW); + write_stringW(stream, close_element); + write_stringW(stream, eol); + SysFreeString(bstr); + } + else + write_element(stream, Principal); + + push_indent(); + + hr = IPrincipal_get_GroupId(principal, &bstr); + if (hr == S_OK) + { + hr = write_text_value(stream, GroupId, bstr); + SysFreeString(bstr); + if (hr != S_OK) return hr; + } + hr = IPrincipal_get_DisplayName(principal, &bstr); + if (hr == S_OK) + { + hr = write_text_value(stream, DisplayName, bstr); + SysFreeString(bstr); + if (hr != S_OK) return hr; + } + hr = IPrincipal_get_UserId(principal, &bstr); + if (hr == S_OK && lstrlenW(bstr)) + { + hr = write_text_value(stream, UserId, bstr); + SysFreeString(bstr); + if (hr != S_OK) return hr; + } + hr = IPrincipal_get_RunLevel(principal, &level); + if (hr == S_OK) + { + const WCHAR *level_str = NULL; + + switch (level) + { + case TASK_RUNLEVEL_HIGHEST: + level_str = HighestAvailable; + break; + case TASK_RUNLEVEL_LUA: + level_str = LeastPrivilege; + break; + default: + FIXME("Principal run level %d\n", level); + break; + } + + if (level_str) + { + hr = write_text_value(stream, RunLevel, level_str); + if (hr != S_OK) return hr; + } + } + hr = IPrincipal_get_LogonType(principal, &logon); + if (hr == S_OK) + { + const WCHAR *logon_str = NULL; + + switch (logon) + { + case TASK_LOGON_PASSWORD: + logon_str = Password; + break; + case TASK_LOGON_S4U: + logon_str = S4U; + break; + case TASK_LOGON_INTERACTIVE_TOKEN: + logon_str = InteractiveToken; + break; + default: + FIXME("Principal logon type %d\n", logon); + break; + } + + if (logon_str) + { + hr = write_text_value(stream, LogonType, logon_str); + if (hr != S_OK) return hr; + } + } + + pop_indent(); + write_element_end(stream, Principal); + + pop_indent(); + return write_element_end(stream, Principals); } static HRESULT write_settings(IStream *stream, ITaskSettings *settings)

1 0

Dmitry Timoshkov : taskschd: ITaskService::NewTask doesn' t need a server connection.
by Alexandre Julliard 22 Feb '14

22 Feb '14

Module: wine Branch: master Commit: 175dc763369cac2779f6dd4c407caeac9d08a712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=175dc763369cac2779f6dd4c4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 21 11:35:38 2014 +0900 taskschd: ITaskService::NewTask doesn't need a server connection. --- dlls/taskschd/task.c | 5 ----- dlls/taskschd/tests/scheduler.c | 3 --- 2 files changed, 8 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 489ade3..8b73bf0 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -2347,15 +2347,10 @@ static HRESULT WINAPI TaskService_GetRunningTasks(ITaskService *iface, LONG flag static HRESULT WINAPI TaskService_NewTask(ITaskService *iface, DWORD flags, ITaskDefinition **definition) { - TaskService *task_svc = impl_from_ITaskService(iface); - TRACE("%p,%x,%p\n", iface, flags, definition); if (!definition) return E_POINTER; - if (!task_svc->connected) - return HRESULT_FROM_WIN32(ERROR_ONLY_IF_CONNECTED); - if (flags) FIXME("unsupported flags %x\n", flags); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 34e4625..35e6dc0 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1099,9 +1099,6 @@ static void test_TaskDefinition(void) V_VT(&v_null) = VT_NULL; - hr = ITaskService_Connect(service, v_null, v_null, v_null, v_null); - ok(hr == S_OK, "Connect error %#x\n", hr); - hr = ITaskService_NewTask(service, 0, &taskdef); ok(hr == S_OK, "NewTask error %#x\n", hr);

1 0

Hans Leidekker : msi: Don't install services without an image path.
by Alexandre Julliard 22 Feb '14

22 Feb '14

Module: wine Branch: master Commit: 1ae3bcc94d5ceb084a1ad99a8b8f2b4de6ce07dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae3bcc94d5ceb084a1ad99a8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 21 16:52:12 2014 +0100 msi: Don't install services without an image path. Spotted by Aric Stewart. --- dlls/msi/action.c | 2 +- dlls/msi/tests/action.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 99 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 07322fe..faf462e 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5793,7 +5793,7 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) ERR("Query failed\n"); goto done; } - key = MSI_RecordGetString(row, 6); + if (!(key = MSI_RecordGetString(row, 6))) goto done; file = msi_get_loaded_file(package, key); msiobj_release(&row->hdr); if (!file) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index ee750b0..4d1af05 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -78,7 +78,8 @@ static const char component_dat[] = "dangler\t{6091DF25-EF96-45F1-B8E9-A9B1420C7A3C}\tTARGETDIR\t4\t\tregdata\n" "component\t\tMSITESTDIR\t0\t1\tfile\n" "service_comp\t{935A0A91-22A3-4F87-BCA8-928FFDFE2353}\tMSITESTDIR\t0\t\tservice_file\n" - "service_comp2\t{3F7B04A4-9521-4649-BDC9-0C8722740A49}\tMSITESTDIR\t0\t\tservice_file2"; + "service_comp2\t{3F7B04A4-9521-4649-BDC9-0C8722740A49}\tMSITESTDIR\t0\t\tservice_file2\n" + "service_comp3\t{DBCD1502-20E3-423F-B53E-F37E263CDC7E}\tMSITESTDIR\t0\t\t\n"; static const char directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" @@ -115,7 +116,8 @@ static const char feature_comp_dat[] = "Two\tTwo\n" "feature\tcomponent\n" "service_feature\tservice_comp\n" - "service_feature\tservice_comp2"; + "service_feature\tservice_comp2\n" + "service_feature\tservice_comp3"; static const char file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" @@ -223,6 +225,14 @@ static const char service_install_dat[] = "TestService\t[SERVNAME]\t[SERVDISP]\t2\t3\t0\t\tservice1[~]+group1[~]service2[~]+group2[~][~]\tTestService\t\t-a arg\tservice_comp\tdescription\n" "TestService2\tSERVNAME2]\t[SERVDISP2]\t2\t3\t0\t\tservice1[~]+group1[~]service2[~]+group2[~][~]\tTestService2\t\t-a arg\tservice_comp2\tdescription"; +static const char service_install2_dat[] = + "ServiceInstall\tName\tDisplayName\tServiceType\tStartType\tErrorControl\t" + "LoadOrderGroup\tDependencies\tStartName\tPassword\tArguments\tComponent_\tDescription\n" + "s72\ts255\tL255\ti4\ti4\ti4\tS255\tS255\tS255\tS255\tS255\ts72\tL255\n" + "ServiceInstall\tServiceInstall\n" + "TestService\tTestService\tTestService\t2\t3\t0\t\t\tTestService\t\t\tservice_comp\t\n" + "TestService4\tTestService4\tTestService4\t2\t3\t0\t\t\tTestService4\t\t\tservice_comp3\t\n"; + static const char service_control_dat[] = "ServiceControl\tName\tEvent\tArguments\tWait\tComponent_\n" "s72\tl255\ti2\tL255\tI2\ts72\n" @@ -1681,6 +1691,19 @@ static const msi_table sds_tables[] = ADD_TABLE(property) }; +static const msi_table sis_tables[] = +{ + ADD_TABLE(component), + ADD_TABLE(directory), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(file), + ADD_TABLE(sds_install_exec_seq), + ADD_TABLE(service_install2), + ADD_TABLE(media), + ADD_TABLE(property) +}; + static const msi_table sr_tables[] = { ADD_TABLE(component), @@ -5263,6 +5286,78 @@ error: DeleteFileA(msifile); } +static void test_install_services(void) +{ + UINT r; + SC_HANDLE manager, service; + BOOL ret; + + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + + create_test_files(); + create_database(msifile, sis_tables, sizeof(sis_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + goto error; + } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); + ok(manager != NULL, "can't open service manager\n"); + if (!manager) goto error; + + service = OpenServiceA(manager, "TestService", GENERIC_ALL); + ok(service != NULL, "TestService not installed\n"); + CloseServiceHandle(service); + + service = OpenServiceA(manager, "TestService4", GENERIC_ALL); + ok(service == NULL, "TestService4 installed\n"); + CloseServiceHandle(manager); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\new", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\changed\\three.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\changed", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\first\\two.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\first", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\service2.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + + manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); + ok(manager != NULL, "can't open service manager\n"); + if (!manager) goto error; + + service = OpenServiceA(manager, "TestService", GENERIC_ALL); + ok(service != NULL, "TestService doesn't exist\n"); + + ret = DeleteService( service ); + ok( ret, "failed to delete service %u\n", GetLastError() ); + + CloseServiceHandle(service); + CloseServiceHandle(manager); + +error: + delete_test_files(); + DeleteFileA(msifile); +} + static void test_self_registration(void) { UINT r; @@ -6476,6 +6571,7 @@ START_TEST(action) test_create_remove_folder(); test_start_services(); test_delete_services(); + test_install_services(); test_self_registration(); test_register_font(); test_validate_product_id();

1 0

Frédéric Delanoy : msvidc32: Use BOOL type where appropriate.
by Alexandre Julliard 22 Feb '14

22 Feb '14

Module: wine Branch: master Commit: aa2f454f37bdfae7a512b53ad6376017a3343a45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa2f454f37bdfae7a512b53ad… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 22 12:22:32 2014 +0100 msvidc32: Use BOOL type where appropriate. --- dlls/msvidc32/msvideo1.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 831e6f7..49f9700 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -67,7 +67,7 @@ typedef BYTE uint8_t; typedef struct Msvideo1Context { DWORD dwMagic; - int mode_8bit; /* if it's not 8-bit, it's 16-bit */ + BOOL mode_8bit; /* if it's not 8-bit, it's 16-bit */ } Msvideo1Context; static void @@ -370,12 +370,12 @@ static LRESULT CRAM_DecompressBegin( Msvideo1Context *info, LPBITMAPINFO in, LPB TRACE("bitmap is %d bpp\n", in->bmiHeader.biBitCount); if( in->bmiHeader.biBitCount == 8 ) - info->mode_8bit = 1; + info->mode_8bit = TRUE; else if( in->bmiHeader.biBitCount == 16 ) - info->mode_8bit = 0; + info->mode_8bit = FALSE; else { - info->mode_8bit = 0; + info->mode_8bit = FALSE; FIXME("Unsupported output format %i\n", in->bmiHeader.biBitCount); }

1 0

Frédéric Delanoy : taskkill: Use BOOL type where appropriate.
by Alexandre Julliard 22 Feb '14

22 Feb '14

Module: wine Branch: master Commit: 17fecb55a1955f44e0ae5f4a811a8cbf5efd0101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17fecb55a1955f44e0ae5f4a8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 22 12:22:34 2014 +0100 taskkill: Use BOOL type where appropriate. --- programs/taskkill/taskkill.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 7f0e7ad..b9dd1a5 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -472,7 +472,7 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) for (i = 1; i < argc; i++) { - int got_im = 0, got_pid = 0; + BOOL got_im = FALSE, got_pid = FALSE; argdata = argv[i]; if (*argdata != '/' && *argdata != '-')

1 0

Bruno Jesus : ws2_32/tests: Add W2K error values as valid.
by Alexandre Julliard 22 Feb '14

22 Feb '14

Module: wine Branch: master Commit: de0c46fd52b9f9f4ebfff256c71b808bbfbf84d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de0c46fd52b9f9f4ebfff256c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Feb 22 11:13:00 2014 -0300 ws2_32/tests: Add W2K error values as valid. --- dlls/ws2_32/tests/sock.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 31db63a..2252245 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7366,13 +7366,17 @@ static void test_completion_port(void) ok(bret == FALSE, "failed to get completion status %u\n", bret); todo_wine ok(GetLastError() == ERROR_NETNAME_DELETED || GetLastError() == ERROR_OPERATION_ABORTED || - GetLastError() == ERROR_CONNECTION_ABORTED, "Last error was %d\n", GetLastError()); + GetLastError() == ERROR_CONNECTION_ABORTED || + GetLastError() == ERROR_PIPE_NOT_CONNECTED /* win 2000 */, + "Last error was %d\n", GetLastError()); ok(key == 125, "Key is %lu\n", key); ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); ok(olp == &ov, "Overlapped structure is at %p\n", olp); todo_wine ok(olp && (olp->Internal == (ULONG)STATUS_LOCAL_DISCONNECT || olp->Internal == (ULONG)STATUS_CANCELLED || - olp->Internal == (ULONG)STATUS_CONNECTION_ABORTED), "Internal status is %lx\n", olp ? olp->Internal : 0); + olp->Internal == (ULONG)STATUS_CONNECTION_ABORTED || + olp->Internal == (ULONG)STATUS_PIPE_DISCONNECTED /* win 2000 */), + "Internal status is %lx\n", olp ? olp->Internal : 0); SetLastError(0xdeadbeef); key = 0xdeadbeef;

1 0

Ken Thomases : wined3d: Call context_enter() before context_update_window( ) so it records the proper restore state.
by Alexandre Julliard 22 Feb '14

22 Feb '14

Module: wine Branch: master Commit: 088dd7289cf031cec70005bb4e0d8e815699d0ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=088dd7289cf031cec70005bb4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 19 16:13:29 2014 -0600 wined3d: Call context_enter() before context_update_window() so it records the proper restore state. --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c835414..6cd04ca 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3000,9 +3000,9 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, str context = swapchain_get_context(device->swapchains[0]); } + context_enter(context); context_update_window(context); context_setup_target(context, target); - context_enter(context); if (!context->valid) return context; if (context != current_context)

1 0

Ken Thomases : wined3d: Remove redundant call to context_set_pixel_format( ) from context_update_window().
by Alexandre Julliard 22 Feb '14

22 Feb '14

Module: wine Branch: master Commit: 2d1e67ee6848dd6b06beee44fdc167c9de811da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d1e67ee6848dd6b06beee44f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 19 16:13:48 2014 -0600 wined3d: Remove redundant call to context_set_pixel_format() from context_update_window(). It calls context_set_gl_context() just after and that starts with a call to context_set_pixel_format(). Also, context_update_window() didn't do the right thing (fall back to swapchain backup DC) if context_set_pixel_format() fails. --- dlls/wined3d/context.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6cd04ca..7d63ca3 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -858,13 +858,6 @@ static void context_update_window(struct wined3d_context *context) goto err; } - if (!context_set_pixel_format(context->gl_info, context->hdc, context->pixel_format)) - { - ERR("Failed to set pixel format %d on device context %p.\n", - context->pixel_format, context->hdc); - goto err; - } - context_set_gl_context(context); return;

1 0