February 2014 - Wine-commits

Jacek Caban : wmp: Added DoVerb(OLEIVERB_HIDE) implementation.
by Alexandre Julliard 24 Feb '14

24 Feb '14

Module: wine Branch: master Commit: bd95cb54041e9dace1d0fe4b01e56d69ed7f9391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd95cb54041e9dace1d0fe4b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 13:03:24 2014 +0100 wmp: Added DoVerb(OLEIVERB_HIDE) implementation. --- dlls/wmp/oleobj.c | 10 ++++++++++ dlls/wmp/tests/oleobj.c | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 29f39d7..3dd2378 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -396,6 +396,16 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms case OLEIVERB_INPLACEACTIVATE: TRACE("(%p)->(OLEIVERB_INPLACEACTIVATE)\n", This); return activate_inplace(This); + + case OLEIVERB_HIDE: + if(!This->hwnd) { + FIXME("No window to hide\n"); + return E_UNEXPECTED; + } + + ShowWindow(This->hwnd, SW_HIDE); + return S_OK; + default: FIXME("Unsupported iVerb %d\n", iVerb); } diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 52110c1..9e27d3b 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -926,6 +926,10 @@ static void test_wmp(void) test_window(hwnd); + hres = IOleObject_DoVerb(oleobj, OLEIVERB_HIDE, NULL, &ClientSite, 0, container_hwnd, &pos); + ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + ok(!IsWindowVisible(hwnd), "Window is visible\n"); + SET_EXPECT(OnShowWindow_FALSE); SET_EXPECT(OnInPlaceDeactivate); hres = IOleObject_Close(oleobj, 0);

1 0

André Hentschel : Ausgabe 363
by Jeremy Newman 24 Feb '14

24 Feb '14

Module: website Branch: master Commit: 8cdbd0c638edb30ee92730280e07079be111ce45 URL: http://source.winehq.org/git/website.git/?a=commit;h=8cdbd0c638edb30ee92730… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 21 22:50:45 2014 +0100 Ausgabe 363 --- news/de/2014021401.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/de/2014021401.xml b/news/de/2014021401.xml new file mode 100644 index 0000000..8bf3d28 --- /dev/null +++ b/news/de/2014021401.xml @@ -0,0 +1,13 @@ +<news> + <date>14. Februar 2014</date> + <title>World Wine News Ausgabe 363</title> + <body> +<a href="{$root}/wwn/363">WWN Ausgabe 363 (en)</a> wurde heute veröffentlicht. +<ul> +<li><a href="{$root}/wwn/363#WWN revived?">WWN wiederbelebt?</a></li> +<li><a href="{$root}/wwn/363#Wine at LinuxTag in Berlin">Wine auf dem LinuxTag in Berlin</a></li> +<li><a href="{$root}/wwn/363#FOSDEM 2014">FOSDEM 2014</a></li> +<li><a href="{$root}/wwn/363#AppDB/Bugzilla Status Changes">AppDB/Bugzilla Statusänderungen</a></li> +</ul> + </body> +</news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.13
by Jeremy Newman 24 Feb '14

24 Feb '14

Module: website Branch: master Commit: 34163205768e3160560ac9ff76880bdd822081a0 URL: http://source.winehq.org/git/website.git/?a=commit;h=34163205768e3160560ac9… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Feb 23 06:43:51 2014 +0100 Polish translation for release 1.7.13 --- news/pl/2014022001.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/pl/2014022001.xml b/news/pl/2014022001.xml new file mode 100644 index 0000000..fe502c9 --- /dev/null +++ b/news/pl/2014022001.xml @@ -0,0 +1,17 @@ +<news> +<date>Luty 20, 2014</date> +<title>Wydano Wine 1.7.13</title> +<body> + Wydanie rozwojowe Wine 1.7.13 jest już dostępne. + <a href="{$root}/announce/1.7.13">Co nowego</a> w tym wydaniu: +<ul> + <li>Szersza obsługa Harmonogramu zadań.</li> + <li>Kilka więcej interfejsów Direct3D 10.</li> + <li>Więcej zalążków funkcji Windows Media Player.</li> + <li>Ulepszenia w generowaniu kodu ARM.</li> + <li>Lepsze zgłaszanie pamięci na Mac OS X.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.13.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

André Hentschel : Wine 1.7.13 freigegeben
by Jeremy Newman 24 Feb '14

24 Feb '14

Module: website Branch: master Commit: 29ce42893bac7bfd99e6cabe7206a0998b220831 URL: http://source.winehq.org/git/website.git/?a=commit;h=29ce42893bac7bfd99e6ca… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 21 22:50:42 2014 +0100 Wine 1.7.13 freigegeben --- news/de/2014020701.xml | 2 +- news/de/2014022001.xml | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/news/de/2014020701.xml b/news/de/2014020701.xml index 12d800d..a013e6c 100644 --- a/news/de/2014020701.xml +++ b/news/de/2014020701.xml @@ -6,7 +6,7 @@ <a href="{$root}/announce/1.7.12">Neuerungen (en)</a> in dieser Version: <ul> <li>Anfängliche Unterstützung der Window Media Player Schnittstellen.</li> - <li>Verbessere Task Scheduler Unterstützung.</li> + <li>Verbesserte Task Scheduler Unterstützung.</li> <li>Verschiedene C++ Laufzeit Fehlerbehebungen.</li> <li>Mehr Dlls mit hässlichen Namen für Windows 8 API Unterstützung.</li> <li>Verschiedene Fehlerbehebungen.</li> diff --git a/news/de/2014022001.xml b/news/de/2014022001.xml new file mode 100644 index 0000000..13beac6 --- /dev/null +++ b/news/de/2014022001.xml @@ -0,0 +1,17 @@ +<news> +<date>20. Februar 2014</date> +<title>Wine 1.7.13 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.13 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.13">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Verbesserte Task Scheduler Unterstützung.</li> + <li>Ein paar neue Direct3D 10 Schnittstellen.</li> + <li>Mehr Windows Media Player Stubs.</li> + <li>Verbesserte ARM Code Generierung.</li> + <li>Verbesserte Angabe der Speichergröße unter Mac OS X.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.13.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Nikolay Sivov : oleaut32: Fix VariantCopy() for VT_RECORD variants.
by Alexandre Julliard 22 Feb '14

22 Feb '14

Module: wine Branch: master Commit: e610713012cb02648202a9568fc0d3febb5f5307 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e610713012cb02648202a9568… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 20 19:12:57 2014 +0400 oleaut32: Fix VariantCopy() for VT_RECORD variants. --- dlls/oleaut32/tests/vartest.c | 50 ++++++++++++++++++++++---- dlls/oleaut32/variant.c | 77 +++++++++++++++++++---------------------- 2 files changed, 79 insertions(+), 48 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 2658025..2f82d9b 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -102,6 +102,8 @@ typedef struct IRecordInfoImpl IRecordInfo IRecordInfo_iface; LONG ref; unsigned int recordclear; + unsigned int getsize; + unsigned int recordcopy; struct __tagBRECORD *rec; } IRecordInfoImpl; @@ -152,15 +154,16 @@ static HRESULT WINAPI RecordInfo_RecordClear(IRecordInfo *iface, void *data) { IRecordInfoImpl* This = impl_from_IRecordInfo(iface); This->recordclear++; - ok(data == (void*)0xdeadbeef, "got %p\n", data); This->rec->pvRecord = NULL; return S_OK; } -static HRESULT WINAPI RecordInfo_RecordCopy(IRecordInfo *iface, void *pvExisting, void *pvNew) +static HRESULT WINAPI RecordInfo_RecordCopy(IRecordInfo *iface, void *src, void *dest) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + IRecordInfoImpl* This = impl_from_IRecordInfo(iface); + This->recordcopy++; + ok(src == (void*)0xdeadbeef, "wrong src pointer %p\n", src); + return S_OK; } static HRESULT WINAPI RecordInfo_GetGuid(IRecordInfo *iface, GUID *pguid) @@ -177,8 +180,10 @@ static HRESULT WINAPI RecordInfo_GetName(IRecordInfo *iface, BSTR *pbstrName) static HRESULT WINAPI RecordInfo_GetSize(IRecordInfo *iface, ULONG* size) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + IRecordInfoImpl* This = impl_from_IRecordInfo(iface); + This->getsize++; + *size = 0; + return S_OK; } static HRESULT WINAPI RecordInfo_GetTypeInfo(IRecordInfo *iface, ITypeInfo **ppTypeInfo) @@ -277,6 +282,10 @@ static IRecordInfoImpl *get_test_recordinfo(void) rec = HeapAlloc(GetProcessHeap(), 0, sizeof(IRecordInfoImpl)); rec->IRecordInfo_iface.lpVtbl = &RecordInfoVtbl; rec->ref = 1; + rec->recordclear = 0; + rec->getsize = 0; + rec->recordcopy = 0; + return rec; } @@ -765,6 +774,8 @@ static void test_VariantClear(void) static void test_VariantCopy(void) { + struct __tagBRECORD *rec; + IRecordInfoImpl *recinfo; VARIANTARG vSrc, vDst; VARTYPE vt; size_t i; @@ -880,6 +891,33 @@ static void test_VariantCopy(void) } VariantClear(&vDst); } + + /* copy RECORD */ + recinfo = get_test_recordinfo(); + + memset(&vDst, 0, sizeof(vDst)); + V_VT(&vDst) = VT_EMPTY; + + V_VT(&vSrc) = VT_RECORD; + rec = &V_UNION(&vSrc, brecVal); + rec->pRecInfo = &recinfo->IRecordInfo_iface; + rec->pvRecord = (void*)0xdeadbeef; + + recinfo->recordclear = 0; + recinfo->recordcopy = 0; + recinfo->getsize = 0; + recinfo->rec = rec; + hres = VariantCopy(&vDst, &vSrc); + ok(hres == S_OK, "ret %08x\n", hres); + + rec = &V_UNION(&vDst, brecVal); + ok(rec->pvRecord != (void*)0xdeadbeef && rec->pvRecord != NULL, "got %p\n", rec->pvRecord); + ok(rec->pRecInfo == &recinfo->IRecordInfo_iface, "got %p\n", rec->pRecInfo); + ok(recinfo->getsize == 1, "got %d\n", recinfo->recordclear); + ok(recinfo->recordcopy == 1, "got %d\n", recinfo->recordclear); + + VariantClear(&vDst); + VariantClear(&vSrc); } /* Determine if a vt is valid for VariantCopyInd() */ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index d4c6f6c..92cf01b 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -694,34 +694,32 @@ HRESULT WINAPI VariantClear(VARIANTARG* pVarg) /****************************************************************************** * Copy an IRecordInfo object contained in a variant. */ -static HRESULT VARIANT_CopyIRecordInfo(struct __tagBRECORD* pBr) +static HRESULT VARIANT_CopyIRecordInfo(VARIANT *dest, VARIANT *src) { - HRESULT hres = S_OK; + struct __tagBRECORD *dest_rec = &V_UNION(dest, brecVal); + struct __tagBRECORD *src_rec = &V_UNION(src, brecVal); + HRESULT hr = S_OK; + ULONG size; - if (pBr->pRecInfo) + if (!src_rec->pRecInfo) { - ULONG ulSize; + if (src_rec->pvRecord) return E_INVALIDARG; + return S_OK; + } - hres = IRecordInfo_GetSize(pBr->pRecInfo, &ulSize); - if (SUCCEEDED(hres)) - { - PVOID pvRecord = HeapAlloc(GetProcessHeap(), 0, ulSize); - if (!pvRecord) - hres = E_OUTOFMEMORY; - else - { - memcpy(pvRecord, pBr->pvRecord, ulSize); - pBr->pvRecord = pvRecord; + hr = IRecordInfo_GetSize(src_rec->pRecInfo, &size); + if (FAILED(hr)) return hr; - hres = IRecordInfo_RecordCopy(pBr->pRecInfo, pvRecord, pvRecord); - if (SUCCEEDED(hres)) - IRecordInfo_AddRef(pBr->pRecInfo); - } - } - } - else if (pBr->pvRecord) - hres = E_INVALIDARG; - return hres; + /* This could look cleaner if only RecordCreate() was used, but native doesn't use it. + Memory should be allocated in a same way as RecordCreate() does, so RecordDestroy() + could free it later. */ + dest_rec->pvRecord = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (!dest_rec->pvRecord) return E_OUTOFMEMORY; + + dest_rec->pRecInfo = src_rec->pRecInfo; + IRecordInfo_AddRef(src_rec->pRecInfo); + + return IRecordInfo_RecordCopy(src_rec->pRecInfo, src_rec->pvRecord, dest_rec->pvRecord); } /****************************************************************************** @@ -771,29 +769,25 @@ HRESULT WINAPI VariantCopy(VARIANTARG* pvargDest, VARIANTARG* pvargSrc) if (!V_ISBYREF(pvargSrc)) { - if (V_ISARRAY(pvargSrc)) - { - if (V_ARRAY(pvargSrc)) - hres = SafeArrayCopy(V_ARRAY(pvargSrc), &V_ARRAY(pvargDest)); - } - else if (V_VT(pvargSrc) == VT_BSTR) + switch (V_VT(pvargSrc)) { + case VT_BSTR: V_BSTR(pvargDest) = SysAllocStringByteLen((char*)V_BSTR(pvargSrc), SysStringByteLen(V_BSTR(pvargSrc))); if (!V_BSTR(pvargDest)) - { - TRACE("!V_BSTR(pvargDest), SysAllocStringByteLen() failed to allocate %d bytes\n", SysStringByteLen(V_BSTR(pvargSrc))); hres = E_OUTOFMEMORY; - } - } - else if (V_VT(pvargSrc) == VT_RECORD) - { - hres = VARIANT_CopyIRecordInfo(&V_UNION(pvargDest,brecVal)); - } - else if (V_VT(pvargSrc) == VT_DISPATCH || - V_VT(pvargSrc) == VT_UNKNOWN) - { + break; + case VT_RECORD: + hres = VARIANT_CopyIRecordInfo(pvargDest, pvargSrc); + break; + case VT_DISPATCH: + case VT_UNKNOWN: + V_UNKNOWN(pvargDest) = V_UNKNOWN(pvargSrc); if (V_UNKNOWN(pvargSrc)) IUnknown_AddRef(V_UNKNOWN(pvargSrc)); + break; + default: + if (V_ISARRAY(pvargSrc)) + hres = SafeArrayCopy(V_ARRAY(pvargSrc), &V_ARRAY(pvargDest)); } } } @@ -912,8 +906,7 @@ HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, VARIANTARG* pvargSrc) } else if (V_VT(pSrc) == (VT_RECORD|VT_BYREF)) { - V_UNION(pvargDest,brecVal) = V_UNION(pvargSrc,brecVal); - hres = VARIANT_CopyIRecordInfo(&V_UNION(pvargDest,brecVal)); + hres = VARIANT_CopyIRecordInfo(pvargDest, pvargSrc); } else if (V_VT(pSrc) == (VT_DISPATCH|VT_BYREF) || V_VT(pSrc) == (VT_UNKNOWN|VT_BYREF))

1 0

Dmitry Timoshkov : xmllite: Also clear the attr pointer in reader_clear_attrs.
by Alexandre Julliard 22 Feb '14

22 Feb '14

Module: wine Branch: master Commit: 529d9ea9222cff9edfd9e1c7a89befd70f0359f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=529d9ea9222cff9edfd9e1c7a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 21 11:35:05 2014 +0900 xmllite: Also clear the attr pointer in reader_clear_attrs. --- dlls/xmllite/reader.c | 1 + dlls/xmllite/tests/reader.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index fb06200..f74b815 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -368,6 +368,7 @@ static void reader_clear_attrs(xmlreader *reader) } list_init(&reader->attrs); reader->attr_count = 0; + reader->attr = NULL; } /* attribute data holds pointers to buffer data, so buffer shrink is not possible diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 992d15c..0108027 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -838,7 +838,6 @@ todo_wine ok(count == 0, "expected 0, got %d\n", count); ret = IXmlReader_IsEmptyElement(reader); -todo_wine ok(ret, "element should be empty\n"); hr = IXmlReader_GetValue(reader, &val, NULL);

1 0

Dmitry Timoshkov : include: Fix typedef for TASK_RUNLEVEL_TYPE.
by Alexandre Julliard 22 Feb '14

22 Feb '14

Module: wine Branch: master Commit: 02bd13dfdf086ea89499efa0925cd1ae1e6b71d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02bd13dfdf086ea89499efa09… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 21 11:35:10 2014 +0900 include: Fix typedef for TASK_RUNLEVEL_TYPE. --- include/taskschd.idl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/taskschd.idl b/include/taskschd.idl index 3b6bc2f..6b86a01 100644 --- a/include/taskschd.idl +++ b/include/taskschd.idl @@ -58,7 +58,7 @@ typedef enum _TASK_RUNLEVEL { TASK_RUNLEVEL_LUA, TASK_RUNLEVEL_HIGHEST -} TASK_RUNLEVEL; +} TASK_RUNLEVEL_TYPE; typedef enum _TASK_TRIGGER_TYPE2 { @@ -509,8 +509,8 @@ interface IPrincipal : IDispatch [propput] HRESULT LogonType([in] TASK_LOGON_TYPE logon); [propget] HRESULT GroupId([out, retval] BSTR *group); [propput] HRESULT GroupId([in] BSTR group); - [propget] HRESULT RunLevel([out, retval] TASK_RUNLEVEL *level); - [propput] HRESULT RunLevel([in] TASK_RUNLEVEL level); + [propget] HRESULT RunLevel([out, retval] TASK_RUNLEVEL_TYPE *level); + [propput] HRESULT RunLevel([in] TASK_RUNLEVEL_TYPE level); } [

1 0

Dmitry Timoshkov : taskschd: Add support for reading more TaskSettings fields to XML parser.
by Alexandre Julliard 22 Feb '14

22 Feb '14

Module: wine Branch: master Commit: 606ee6cce38af6ac2d3863e233fcdb77340cfd54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=606ee6cce38af6ac2d3863e23… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 21 11:35:15 2014 +0900 taskschd: Add support for reading more TaskSettings fields to XML parser. --- dlls/taskschd/task.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index fbf4ae1..4650b0e 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1061,6 +1061,9 @@ 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}; static const WCHAR AllowStartOnDemand[] = {'A','l','l','o','w','S','t','a','r','t','O','n','D','e','m','a','n','d',0}; static const WCHAR StopIfGoingOnBatteries[] = {'S','t','o','p','I','f','G','o','i','n','g','O','n','B','a','t','t','e','r','i','e','s',0}; +static const WCHAR AllowHardTerminate[] = {'A','l','l','o','w','H','a','r','d','T','e','r','m','i','n','a','t','e',0}; +static const WCHAR StartWhenAvailable[] = {'S','t','a','r','t','W','h','e','n','A','v','a','i','l','a','b','l','e',0}; +static const WCHAR RunOnlyIfNetworkAvailable[] = {'R','u','n','O','n','l','y','I','f','N','e','t','w','o','r','k','A','v','a','i','l','a','b','l','e',0}; static const WCHAR Enabled[] = {'E','n','a','b','l','e','d',0}; static const WCHAR Hidden[] = {'H','i','d','d','e','n',0}; static const WCHAR RunOnlyIfIdle[] = {'R','u','n','O','n','l','y','I','f','I','d','l','e',0}; @@ -1226,6 +1229,24 @@ static HRESULT read_settings(IXmlReader *reader, ITaskSettings *taskset) if (hr == S_OK) ITaskSettings_put_StopIfGoingOnBatteries(taskset, bool_val); } + else if (!lstrcmpW(name, AllowHardTerminate)) + { + hr = read_variantbool_value(reader, &bool_val); + if (hr == S_OK) + ITaskSettings_put_AllowHardTerminate(taskset, bool_val); + } + else if (!lstrcmpW(name, StartWhenAvailable)) + { + hr = read_variantbool_value(reader, &bool_val); + if (hr == S_OK) + ITaskSettings_put_StartWhenAvailable(taskset, bool_val); + } + else if (!lstrcmpW(name, RunOnlyIfNetworkAvailable)) + { + hr = read_variantbool_value(reader, &bool_val); + if (hr == S_OK) + ITaskSettings_put_RunOnlyIfNetworkAvailable(taskset, bool_val); + } else if (!lstrcmpW(name, Enabled)) { hr = read_variantbool_value(reader, &bool_val);

1 0

Dmitry Timoshkov : taskschd: Add support for reading RegistrationInfo to XML parser.
by Alexandre Julliard 22 Feb '14

22 Feb '14

Module: wine Branch: master Commit: a7c70a4904d8d987fb5bbc5b57358ac3f24916f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7c70a4904d8d987fb5bbc5b5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 21 11:35:18 2014 +0900 taskschd: Add support for reading RegistrationInfo to XML parser. --- dlls/taskschd/task.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 72 insertions(+), 4 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 4650b0e..b0af394 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1052,6 +1052,8 @@ static const WCHAR v1_3[] = {'1','.','3',0}; static const WCHAR xmlns[] = {'x','m','l','n','s',0}; static const WCHAR task_ns[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','m','i','c','r','o','s','o','f','t','.','c','o','m','/','w','i','n','d','o','w','s','/','2','0','0','4','/','0','2','/','m','i','t','/','t','a','s','k',0}; 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 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}; @@ -1307,10 +1309,69 @@ static HRESULT read_settings(IXmlReader *reader, ITaskSettings *taskset) return E_FAIL; } -static HRESULT read_registration_info(IXmlReader *reader, ITaskDefinition *taskdef) +static HRESULT read_registration_info(IXmlReader *reader, IRegistrationInfo *info) { - FIXME("stub\n"); - return S_OK; + HRESULT hr; + XmlNodeType type; + const WCHAR *name; + WCHAR *value; + + if (IXmlReader_IsEmptyElement(reader)) + { + TRACE("RegistrationInfo is empty\n"); + return S_OK; + } + + while (IXmlReader_Read(reader, &type) == S_OK) + { + switch (type) + { + case XmlNodeType_EndElement: + hr = IXmlReader_GetLocalName(reader, &name, NULL); + if (hr != S_OK) return hr; + + TRACE("/%s\n", debugstr_w(name)); + + if (!lstrcmpW(name, RegistrationInfo)) + return S_OK; + + break; + + case XmlNodeType_Element: + hr = IXmlReader_GetLocalName(reader, &name, NULL); + if (hr != S_OK) return hr; + + TRACE("Element: %s\n", debugstr_w(name)); + + if (!lstrcmpW(name, Author)) + { + hr = read_text_value(reader, &value); + if (hr == S_OK) + IRegistrationInfo_put_Author(info, value); + } + else if (!lstrcmpW(name, Description)) + { + hr = read_text_value(reader, &value); + if (hr == S_OK) + IRegistrationInfo_put_Description(info, value); + } + else + FIXME("unhandled RegistrationInfo element %s\n", debugstr_w(name)); + + break; + + case XmlNodeType_Whitespace: + case XmlNodeType_Comment: + break; + + default: + FIXME("unhandled RegistrationInfo node type %d\n", type); + break; + } + } + + WARN("RegistrationInfo was not terminated\n"); + return E_FAIL; } static HRESULT read_task_attributes(IXmlReader *reader, ITaskDefinition *taskdef) @@ -1403,7 +1464,14 @@ static HRESULT read_task(IXmlReader *reader, ITaskDefinition *taskdef) TRACE("Element: %s\n", debugstr_w(name)); if (!lstrcmpW(name, RegistrationInfo)) - hr = read_registration_info(reader, taskdef); + { + IRegistrationInfo *info; + + hr = ITaskDefinition_get_RegistrationInfo(taskdef, &info); + if (hr != S_OK) return hr; + hr = read_registration_info(reader, info); + IRegistrationInfo_Release(info); + } else if (!lstrcmpW(name, Settings)) { ITaskSettings *taskset;

1 0

Dmitry Timoshkov : taskschd: Add support for reading Principals to XML parser.
by Alexandre Julliard 22 Feb '14

22 Feb '14

Module: wine Branch: master Commit: 3cb5015c4aa9a5b0a1ede9d8e2e55d2d560e27ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cb5015c4aa9a5b0a1ede9d8e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 21 11:35:22 2014 +0900 taskschd: Add support for reading Principals to XML parser. --- dlls/taskschd/task.c | 186 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 184 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index b0af394..f23a7ad 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1057,6 +1057,13 @@ static const WCHAR Description[] = {'D','e','s','c','r','i','p','t','i','o','n', 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}; +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 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}; static const WCHAR Actions[] = {'A','c','t','i','o','n','s',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}; @@ -1144,12 +1151,187 @@ static HRESULT read_triggers(IXmlReader *reader, ITaskDefinition *taskdef) return S_OK; } -static HRESULT read_principals(IXmlReader *reader, ITaskDefinition *taskdef) +static HRESULT read_principal_attributes(IXmlReader *reader, IPrincipal *principal) { - FIXME("stub\n"); + HRESULT hr; + const WCHAR *name; + const WCHAR *value; + + hr = IXmlReader_MoveToFirstAttribute(reader); + + while (hr == S_OK) + { + hr = IXmlReader_GetLocalName(reader, &name, NULL); + if (hr != S_OK) break; + + hr = IXmlReader_GetValue(reader, &value, NULL); + if (hr != S_OK) break; + + TRACE("%s=%s\n", debugstr_w(name), debugstr_w(value)); + + if (!lstrcmpW(name, id)) + IPrincipal_put_Id(principal, (BSTR)value); + else + FIXME("unhandled Principal attribute %s\n", debugstr_w(name)); + + hr = IXmlReader_MoveToNextAttribute(reader); + } + return S_OK; } +static HRESULT read_principal(IXmlReader *reader, IPrincipal *principal) +{ + HRESULT hr; + XmlNodeType type; + const WCHAR *name; + WCHAR *value; + + if (IXmlReader_IsEmptyElement(reader)) + { + TRACE("Principal is empty\n"); + return S_OK; + } + + read_principal_attributes(reader, principal); + + while (IXmlReader_Read(reader, &type) == S_OK) + { + switch (type) + { + case XmlNodeType_EndElement: + hr = IXmlReader_GetLocalName(reader, &name, NULL); + if (hr != S_OK) return hr; + + TRACE("/%s\n", debugstr_w(name)); + + if (!lstrcmpW(name, Principal)) + return S_OK; + + break; + + case XmlNodeType_Element: + hr = IXmlReader_GetLocalName(reader, &name, NULL); + if (hr != S_OK) return hr; + + TRACE("Element: %s\n", debugstr_w(name)); + + if (!lstrcmpW(name, UserId)) + { + hr = read_text_value(reader, &value); + if (hr == S_OK) + IPrincipal_put_UserId(principal, value); + } + else if (!lstrcmpW(name, LogonType)) + { + hr = read_text_value(reader, &value); + if (hr == S_OK) + { + TASK_LOGON_TYPE logon = TASK_LOGON_NONE; + + if (!lstrcmpW(value, InteractiveToken)) + logon = TASK_LOGON_INTERACTIVE_TOKEN; + else + FIXME("unhandled LogonType %s\n", debugstr_w(value)); + + IPrincipal_put_LogonType(principal, logon); + } + } + else if (!lstrcmpW(name, RunLevel)) + { + hr = read_text_value(reader, &value); + if (hr == S_OK) + { + TASK_RUNLEVEL_TYPE level = TASK_RUNLEVEL_LUA; + + if (!lstrcmpW(value, LeastPrivilege)) + level = TASK_RUNLEVEL_LUA; + else + FIXME("unhandled RunLevel %s\n", debugstr_w(value)); + + IPrincipal_put_RunLevel(principal, level); + } + } + else + FIXME("unhandled Principal element %s\n", debugstr_w(name)); + + break; + + case XmlNodeType_Whitespace: + case XmlNodeType_Comment: + break; + + default: + FIXME("unhandled Principal node type %d\n", type); + break; + } + } + + WARN("Principal was not terminated\n"); + return E_FAIL; +} + +static HRESULT read_principals(IXmlReader *reader, ITaskDefinition *taskdef) +{ + HRESULT hr; + XmlNodeType type; + const WCHAR *name; + + if (IXmlReader_IsEmptyElement(reader)) + { + TRACE("Principals is empty\n"); + return S_OK; + } + + while (IXmlReader_Read(reader, &type) == S_OK) + { + switch (type) + { + case XmlNodeType_EndElement: + hr = IXmlReader_GetLocalName(reader, &name, NULL); + if (hr != S_OK) return hr; + + TRACE("/%s\n", debugstr_w(name)); + + if (!lstrcmpW(name, Principals)) + return S_OK; + + break; + + case XmlNodeType_Element: + hr = IXmlReader_GetLocalName(reader, &name, NULL); + if (hr != S_OK) return hr; + + TRACE("Element: %s\n", debugstr_w(name)); + + if (!lstrcmpW(name, Principal)) + { + IPrincipal *principal; + + hr = ITaskDefinition_get_Principal(taskdef, &principal); + if (hr != S_OK) return hr; + hr = read_principal(reader, principal); + IPrincipal_Release(principal); + } + else + FIXME("unhandled Principals element %s\n", debugstr_w(name)); + + break; + + case XmlNodeType_Whitespace: + case XmlNodeType_Comment: + break; + + default: + FIXME("unhandled Principals node type %d\n", type); + break; + } + } + + WARN("Principals was not terminated\n"); + return E_FAIL; +} + static HRESULT read_actions(IXmlReader *reader, ITaskDefinition *taskdef) { FIXME("stub\n");

1 0