July 2022 - Wine-commits - list.winehq.org

Giovanni Mascellani : faudio: Import upstream commit e3c444e4f819d2364a6adb0ae73b1d01185b1e93.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 4be1dc1b7be951f79bbae4a1838f07b7512ddb8b URL: https://gitlab.winehq.org/wine/wine/-/commit/4be1dc1b7be951f79bbae4a1838f07… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Jul 18 12:58:18 2022 +0200 faudio: Import upstream commit e3c444e4f819d2364a6adb0ae73b1d01185b1e93. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/faudio/include/FAudio.h | 2 +- libs/faudio/src/FACT.c | 36 ++++++++++-- libs/faudio/src/FACT_internal.h | 1 + libs/faudio/src/FAudioFX_reverb.c | 99 ++++++++++++++++++--------------- libs/faudio/src/FAudio_internal_simd.c | 8 +-- libs/faudio/src/FAudio_platform_win32.c | 4 ++ 6 files changed, 97 insertions(+), 53 deletions(-)

1 0

Giovanni Mascellani : xactengine3_7: Forward wave bank notifications to the application.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 6e51e0839cedfb7034c638ac35ac221582fc959d URL: https://gitlab.winehq.org/wine/wine/-/commit/6e51e0839cedfb7034c638ac35ac22… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jul 8 12:45:54 2022 +0200 xactengine3_7: Forward wave bank notifications to the application. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/xactengine3_7/tests/xact3.c | 5 +- dlls/xactengine3_7/xact_dll.c | 201 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 192 insertions(+), 14 deletions(-)

1 0

Jinoh Kang : shell32: Return stub bitmap in IShellItemImageFactory::GetImage.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 16d785d41608ba6ca6e73d4255154ceed0647ac2 URL: https://gitlab.winehq.org/wine/wine/-/commit/16d785d41608ba6ca6e73d4255154c… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Fri Jul 15 01:59:58 2022 +0900 shell32: Return stub bitmap in IShellItemImageFactory::GetImage. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52673 --- dlls/shell32/shellitem.c | 17 +++++++++++++++-- dlls/shell32/tests/shlfolder.c | 1 - 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 3e8bd24a429..a6d4ee9ef07 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -569,13 +569,26 @@ static HRESULT WINAPI ShellItem_IShellItemImageFactory_GetImage(IShellItemImageF SIZE size, SIIGBF flags, HBITMAP *phbm) { ShellItem *This = impl_from_IShellItemImageFactory(iface); + static const BITMAPINFOHEADER dummy_bmi_header = { + .biSize = sizeof(dummy_bmi_header), + .biWidth = 1, + .biHeight = 1, + .biPlanes = 1, + .biBitCount = 32, + .biCompression = BI_RGB + }; static int once; if (!once++) FIXME("%p ({%lu, %lu} %d %p): stub\n", This, size.cx, size.cy, flags, phbm); - *phbm = NULL; - return E_NOTIMPL; + if (!(*phbm = CreateDIBSection(NULL, (const BITMAPINFO *)&dummy_bmi_header, + DIB_RGB_COLORS, NULL, NULL, 0))) + { + return E_OUTOFMEMORY; + } + + return S_OK; } static const IShellItemImageFactoryVtbl ShellItem_IShellItemImageFactory_Vtbl = { diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 267c81a0ec5..02a5c0dfb2d 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4487,7 +4487,6 @@ static void test_IShellItemImageFactory(void) ret = IShellItemImageFactory_GetImage(siif, size, SIIGBF_BIGGERSIZEOK, &hbm); IShellItemImageFactory_Release(siif); - todo_wine ok(ret == S_OK, "GetImage returned %lx\n", ret); ok(FAILED(ret) == !hbm, "result = %lx but bitmap = %p\n", ret, hbm);

1 0

Francois Gouget : advapi32/tests: Fix the print format, LARGE_INTEGER is signed.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 321ec274d7a2bd8b7921b45aeba3233d28ae6453 URL: https://gitlab.winehq.org/wine/wine/-/commit/321ec274d7a2bd8b7921b45aeba323… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 17 23:13:01 2022 +0200 advapi32/tests: Fix the print format, LARGE_INTEGER is signed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/advapi32/tests/registry.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 51e391fb134..df56b0968ee 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3676,18 +3676,18 @@ static void test_performance_keys(void) ok(data->PerfTime.QuadPart >= perftime1.QuadPart && data->PerfTime.QuadPart <= perftime2.QuadPart, - "got times %I64u, %I64u, %I64u\n", + "got times %I64d, %I64d, %I64d\n", perftime1.QuadPart, data->PerfTime.QuadPart, perftime2.QuadPart); - ok(data->PerfFreq.QuadPart == freq.QuadPart, "expected frequency %I64u, got %I64u\n", + ok(data->PerfFreq.QuadPart == freq.QuadPart, "expected frequency %I64d, got %I64d\n", freq.QuadPart, data->PerfFreq.QuadPart); ok(data->PerfTime100nSec.QuadPart >= systime1.QuadPart && data->PerfTime100nSec.QuadPart <= systime2.QuadPart, - "got times %I64u, %I64u, %I64u\n", + "got times %I64d, %I64d, %I64d\n", systime1.QuadPart, data->PerfTime100nSec.QuadPart, systime2.QuadPart); SystemTimeToFileTime(&data->SystemTime, &file_time.f); /* SYSTEMTIME has a granularity of 1 ms */ ok(file_time.l >= systime1.QuadPart - 10000 && file_time.l <= systime2.QuadPart, - "got times %I64u, %I64u, %I64u\n", systime1.QuadPart, file_time.l, systime2.QuadPart); + "got times %I64d, %I64d, %I64d\n", systime1.QuadPart, file_time.l, systime2.QuadPart); ok(data->SystemNameLength == (sysname_len + 1) * sizeof(WCHAR), "expected name len %Iu, got %lu\n",

1 0

Francois Gouget : urlmon/tests: Trace why the test file creation failed.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 58b686090d38faaa5fa4cc9a464b1854d7a88aa6 URL: https://gitlab.winehq.org/wine/wine/-/commit/58b686090d38faaa5fa4cc9a464b18… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Jul 9 16:05:51 2022 +0200 urlmon/tests: Trace why the test file creation failed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/urlmon/tests/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index cfd29910f35..1521f8af99b 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -3771,7 +3771,7 @@ static void create_file(const char *file_name, const char *content) file = CreateFileA(file_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %lu\n", GetLastError()); if(file == INVALID_HANDLE_VALUE) return;

1 0

Francois Gouget : dbghelp: Fix the spelling of a comment.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 188e8988abf80d6264e1b255d99a664cb3a75ba1 URL: https://gitlab.winehq.org/wine/wine/-/commit/188e8988abf80d6264e1b255d99a66… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 9 15:57:55 2022 +0200 dbghelp: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dbghelp/msc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index bec9dec2532..2fca1f229d1 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -803,7 +803,7 @@ static BOOL codeview_resolve_forward_type(struct codeview_type_parse* ctp, const unsigned hash; /* Unfortunately, hash of forward defs are computed on the whole type record, not its name - * (unlike hash of UDT & enum implementations which is based primarly on the name... sigh) + * (unlike hash of UDT & enum implementations which is based primarily on the name... sigh) * So compute the hash of the expected implementation. */ if (!codeview_type_extract_name(cvref, &nameref, &lenref, &decoratedref)) return FALSE;

1 0

Eric Pouech : msvcrt: Fix demangling of variables being an array.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: cadac12760161d724a1c3c05cdaca78d73a4b4b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/cadac12760161d724a1c3c05cdaca7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Jul 16 12:20:25 2022 +0200 msvcrt: Fix demangling of variables being an array. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/tests/cpp.c | 1 + dlls/msvcrt/undname.c | 32 ++++++++++++++++++-------------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 79ea9d75c6b..58ecd1327a5 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1294,6 +1294,7 @@ static void test_demangle(void) /* 131 */ {"??_R0?AVCC(a)DD@@@8", "class DD::CC `RTTI Type Descriptor'"}, /* 132 */ {"??$meth(a)FD@DD(a)CC@@QAE_NK(a)Z", "public: bool __thiscall CC::DD::meth<short,char>(unsigned long)"}, /* 133 */ {"?func@@YAXPIFAH(a)Z", "void __cdecl func(int __unaligned * __restrict)"}, +/* 135 */ {"?x@@3PAY02HA", "int (* x)[3]"}, }; int i, num_test = ARRAY_SIZE(test); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 4b53ac459fb..acfe96fe436 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -466,11 +466,14 @@ static BOOL get_modified_type(struct datatype_t *ct, struct parsed_symbol* sym, default: return FALSE; } if (ref || str_modif || xdt.left || xdt.right) - str_modif = str_printf(sym, " %s%s%s%s%s%s%s", - xdt.left, - xdt.left && ref ? " " : NULL, ref, - (xdt.left || ref) && xdt.right ? " " : NULL, xdt.right, - (xdt.left || ref || xdt.right) && str_modif ? " " : NULL, str_modif); + ct->left = str_printf(sym, " %s%s%s%s%s%s%s", + xdt.left, + xdt.left && ref ? " " : NULL, ref, + (xdt.left || ref) && xdt.right ? " " : NULL, xdt.right, + (xdt.left || ref || xdt.right) && str_modif ? " " : NULL, str_modif); + else + ct->left = NULL; + ct->right = NULL; if (get_modifier(sym, &xdt)) { @@ -487,29 +490,30 @@ static BOOL get_modified_type(struct datatype_t *ct, struct parsed_symbol* sym, if (!(n1 = get_number(sym))) return FALSE; num = atoi(n1); - if (str_modif[0] == ' ' && !xdt.left) - str_modif++; + if (ct->left && ct->left[0] == ' ' && !xdt.left) + ct->left++; - str_modif = str_printf(sym, " (%s%s)", xdt.left, str_modif); + ct->left = str_printf(sym, " (%s%s", xdt.left, ct->left); + ct->right = ")"; xdt.left = NULL; while (num--) - str_modif = str_printf(sym, "%s[%s]", str_modif, get_number(sym)); + ct->right = str_printf(sym, "%s[%s]", ct->right, get_number(sym)); } /* Recurse to get the referred-to type */ if (!demangle_datatype(sym, &sub_ct, pmt_ref, FALSE)) return FALSE; if (xdt.left) - ct->left = str_printf(sym, "%s %s%s", sub_ct.left, xdt.left, str_modif); + ct->left = str_printf(sym, "%s %s%s", sub_ct.left, xdt.left, ct->left); else { /* don't insert a space between duplicate '*' */ - if (!in_args && str_modif && str_modif[0] && str_modif[1] == '*' && sub_ct.left[strlen(sub_ct.left)-1] == '*') - str_modif++; - ct->left = str_printf(sym, "%s%s", sub_ct.left, str_modif ); + if (!in_args && ct->left && ct->left[0] && ct->left[1] == '*' && sub_ct.left[strlen(sub_ct.left)-1] == '*') + ct->left++; + ct->left = str_printf(sym, "%s%s", sub_ct.left, ct->left); } - ct->right = sub_ct.right; + if (sub_ct.right) ct->right = str_printf(sym, "%s%s", ct->right, sub_ct.right); sym->stack.num = mark; } return TRUE;

1 0

Jinoh Kang : advapi32/tests: Add tests for GetTokenInformation TokenOwner.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: e61d4853f1f32ed5e76afc7160c663a29da31136 URL: https://gitlab.winehq.org/wine/wine/-/commit/e61d4853f1f32ed5e76afc7160c663… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Jul 18 02:29:49 2022 +0900 advapi32/tests: Add tests for GetTokenInformation TokenOwner. --- dlls/advapi32/tests/security.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index aeee279a86d..56b30ccc87a 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1773,6 +1773,7 @@ static void test_token_attr(void) TOKEN_PRIVILEGES *Privileges; TOKEN_GROUPS *Groups; TOKEN_USER *User; + TOKEN_OWNER *Owner; TOKEN_DEFAULT_DACL *Dacl; BOOL ret; DWORD i, GLE; @@ -1874,6 +1875,20 @@ static void test_token_attr(void) LocalFree(SidString); HeapFree(GetProcessHeap(), 0, User); + /* owner */ + ret = GetTokenInformation(Token, TokenOwner, NULL, 0, &Size); + ok(!ret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "GetTokenInformation(TokenOwner) failed with error %ld\n", GetLastError()); + Owner = HeapAlloc(GetProcessHeap(), 0, Size); + ret = GetTokenInformation(Token, TokenOwner, Owner, Size, &Size); + ok(ret, + "GetTokenInformation(TokenOwner) failed with error %ld\n", GetLastError()); + + ConvertSidToStringSidA(Owner->Owner, &SidString); + trace("TokenOwner: %s\n", SidString); + LocalFree(SidString); + HeapFree(GetProcessHeap(), 0, Owner); + /* logon */ ret = GetTokenInformation(Token, TokenLogonSid, NULL, 0, &Size); if (!ret && (GetLastError() == ERROR_INVALID_PARAMETER))

1 0

Paul Gofman : taskschd: Implement writing settings to XML.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 7e4d4a7edb9c6e69f68491359cea0eb0c6af3de0 URL: https://gitlab.winehq.org/wine/wine/-/commit/7e4d4a7edb9c6e69f68491359cea0e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jul 15 16:11:51 2022 -0500 taskschd: Implement writing settings to XML. --- dlls/taskschd/task.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 106 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 8c9fc9f2582..28c0ff89945 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -2457,6 +2457,19 @@ static inline HRESULT write_text_value(IStream *stream, const WCHAR *name, const return write_stringW(stream, L">\n"); } +static HRESULT write_bool_value(IStream *stream, const WCHAR *name, VARIANT_BOOL value) +{ + return write_text_value(stream, name, value ? L"true" : L"false"); +} + +static HRESULT write_int_value(IStream *stream, const WCHAR *name, int val) +{ + WCHAR s[32]; + + swprintf(s, ARRAY_SIZE(s), L"%d", val); + return write_text_value(stream, name, s); +} + static HRESULT write_task_attributes(IStream *stream, ITaskDefinition *taskdef) { HRESULT hr; @@ -2684,12 +2697,104 @@ static HRESULT write_principal(IStream *stream, IPrincipal *principal) return write_element_end(stream, L"Principals"); } +const WCHAR *string_from_instances_policy(TASK_INSTANCES_POLICY policy) +{ + switch (policy) + { + case TASK_INSTANCES_PARALLEL: return L"Parallel"; + case TASK_INSTANCES_QUEUE: return L"Queue"; + case TASK_INSTANCES_IGNORE_NEW: return L"IgnoreNew"; + case TASK_INSTANCES_STOP_EXISTING : return L"StopExisting"; + } + return L"<error>"; +} + static HRESULT write_settings(IStream *stream, ITaskSettings *settings) { + INetworkSettings *network_settings; + TASK_INSTANCES_POLICY policy; + IIdleSettings *idle_settings; + VARIANT_BOOL bval; + HRESULT hr; + INT ival; + BSTR s; + if (!settings) return write_empty_element(stream, L"Settings"); - FIXME("stub\n"); + if (FAILED(hr = write_element(stream, L"Settings"))) + return hr; + + push_indent(); + +#define WRITE_BOOL_OPTION(name) \ + { \ + if (FAILED(hr = ITaskSettings_get_##name(settings, &bval))) \ + return hr; \ + if (FAILED(hr = write_bool_value(stream, L ## #name, bval))) \ + return hr; \ + } + + + if (FAILED(hr = ITaskSettings_get_AllowDemandStart(settings, &bval))) + return hr; + if (FAILED(hr = write_bool_value(stream, L"AllowStartOnDemand", bval))) + return hr; + + if (SUCCEEDED(hr = TaskSettings_get_RestartInterval(settings, &s)) && s) + { + FIXME("RestartInterval not handled.\n"); + SysFreeString(s); + } + if (FAILED(hr = ITaskSettings_get_MultipleInstances(settings, &policy))) + return hr; + if (FAILED(hr = write_text_value(stream, L"MultipleInstancesPolicy", string_from_instances_policy(policy)))) + return hr; + + WRITE_BOOL_OPTION(DisallowStartIfOnBatteries); + WRITE_BOOL_OPTION(StopIfGoingOnBatteries); + WRITE_BOOL_OPTION(AllowHardTerminate); + WRITE_BOOL_OPTION(StartWhenAvailable); + WRITE_BOOL_OPTION(RunOnlyIfNetworkAvailable); + WRITE_BOOL_OPTION(WakeToRun); + WRITE_BOOL_OPTION(Enabled); + WRITE_BOOL_OPTION(Hidden); + + if (SUCCEEDED(hr = TaskSettings_get_DeleteExpiredTaskAfter(settings, &s)) && s) + { + hr = write_text_value(stream, L"DeleteExpiredTaskAfter", s); + SysFreeString(s); + if (FAILED(hr)) + return hr; + } + if (SUCCEEDED(hr = TaskSettings_get_IdleSettings(settings, &idle_settings))) + { + FIXME("IdleSettings not handled.\n"); + IIdleSettings_Release(idle_settings); + } + if (SUCCEEDED(hr = TaskSettings_get_NetworkSettings(settings, &network_settings))) + { + FIXME("NetworkSettings not handled.\n"); + INetworkSettings_Release(network_settings); + } + if (SUCCEEDED(hr = TaskSettings_get_ExecutionTimeLimit(settings, &s)) && s) + { + hr = write_text_value(stream, L"ExecutionTimeLimit", s); + SysFreeString(s); + if (FAILED(hr)) + return hr; + } + if (FAILED(hr = ITaskSettings_get_Priority(settings, &ival))) + return hr; + if (FAILED(hr = write_int_value(stream, L"Priority", ival))) + return hr; + + WRITE_BOOL_OPTION(RunOnlyIfIdle); +#undef WRITE_BOOL_OPTION + + pop_indent(); + write_element_end(stream, L"Settings"); + return S_OK; }

1 0

Paul Gofman : schedsvc: Read task enable state from XML in SchRpcGetTaskInfo().
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 6e7f5f8e5fceef78b11950598b58fd3b0816df7b URL: https://gitlab.winehq.org/wine/wine/-/commit/6e7f5f8e5fceef78b11950598b58fd… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jul 15 17:31:26 2022 -0500 schedsvc: Read task enable state from XML in SchRpcGetTaskInfo(). --- dlls/schedsvc/Makefile.in | 2 +- dlls/schedsvc/schedsvc.c | 226 +++++++++++++++++++++++++++++++++++++++- dlls/taskschd/tests/scheduler.c | 4 - 3 files changed, 225 insertions(+), 7 deletions(-) diff --git a/dlls/schedsvc/Makefile.in b/dlls/schedsvc/Makefile.in index 021cae468a6..ccd483edae2 100644 --- a/dlls/schedsvc/Makefile.in +++ b/dlls/schedsvc/Makefile.in @@ -1,5 +1,5 @@ MODULE = schedsvc.dll -IMPORTS = rpcrt4 advapi32 ole32 +IMPORTS = rpcrt4 advapi32 ole32 xmllite C_SRCS = \ atsvc.c \ diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index ee200d94a6c..ba6da110fe5 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -20,7 +20,12 @@ #include <stdarg.h> +#define COBJMACROS + #include "windef.h" +#include "initguid.h" +#include "objbase.h" +#include "xmllite.h" #include "schrpc.h" #include "taskschd.h" #include "wine/debug.h" @@ -31,6 +36,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(schedsvc); static const char bom_utf8[] = { 0xef,0xbb,0xbf }; +struct task_info +{ + BOOL enabled; +}; + HRESULT __cdecl SchRpcHighestVersion(DWORD *version) { TRACE("%p\n", version); @@ -310,6 +320,212 @@ static HRESULT read_xml(const WCHAR *name, WCHAR **xml) return hr; } +static HRESULT read_text_value(IXmlReader *reader, WCHAR **value) +{ + HRESULT hr; + XmlNodeType type; + + while (IXmlReader_Read(reader, &type) == S_OK) + { + switch (type) + { + case XmlNodeType_Text: + if (FAILED(hr = IXmlReader_GetValue(reader, (const WCHAR **)value, NULL))) + return hr; + TRACE("%s\n", debugstr_w(*value)); + return S_OK; + + case XmlNodeType_Whitespace: + case XmlNodeType_Comment: + break; + + default: + FIXME("unexpected node type %d\n", type); + return E_FAIL; + } + } + + return E_FAIL; +} + +static HRESULT read_variantbool_value(IXmlReader *reader, VARIANT_BOOL *vbool) +{ + WCHAR *value; + HRESULT hr; + + *vbool = VARIANT_FALSE; + + if (FAILED(hr = read_text_value(reader, &value))) + return hr; + + if (!wcscmp(value, L"true")) + { + *vbool = VARIANT_TRUE; + } + else if (wcscmp(value, L"false")) + { + WARN("unexpected bool value %s\n", debugstr_w(value)); + return SCHED_E_INVALIDVALUE; + } + + return S_OK; +} + +static HRESULT read_task_settings(IXmlReader *reader, struct task_info *info) +{ + VARIANT_BOOL bool_val; + const WCHAR *name; + XmlNodeType type; + HRESULT hr; + + if (IXmlReader_IsEmptyElement(reader)) + { + TRACE("Settings 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 (!wcscmp(name, L"Settings")) + 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 (!wcscmp(name, L"Enabled")) + { + if (FAILED(hr = read_variantbool_value(reader, &bool_val))) + return hr; + info->enabled = !!bool_val; + } + break; + default: + break; + } + } + + WARN("Settings was not terminated\n"); + return SCHED_E_MALFORMEDXML; +} + +static HRESULT read_task_info(IXmlReader *reader, struct task_info *info) +{ + const WCHAR *name; + XmlNodeType type; + HRESULT hr; + + if (IXmlReader_IsEmptyElement(reader)) + { + TRACE("Task is empty\n"); + return S_OK; + } + while (IXmlReader_Read(reader, &type) == S_OK) + { + switch (type) + { + case XmlNodeType_EndElement: + if (FAILED(hr = IXmlReader_GetLocalName(reader, &name, NULL))) + return hr; + + if (!wcscmp(name, L"Task")) + return S_OK; + break; + + case XmlNodeType_Element: + if (FAILED(hr = IXmlReader_GetLocalName(reader, &name, NULL))) + return hr; + + TRACE("Element: %s\n", debugstr_w(name)); + + if (!wcscmp(name, L"Settings")) + { + if (FAILED(hr = read_task_settings(reader, info))) + return hr; + } + break; + + default: + break; + } + } + + WARN("Task was not terminated\n"); + return SCHED_E_MALFORMEDXML; + +} + +static HRESULT read_task_info_from_xml(const WCHAR *xml, struct task_info *info) +{ + IXmlReader *reader; + const WCHAR *name; + XmlNodeType type; + IStream *stream; + HGLOBAL hmem; + HRESULT hr; + void *buf; + + memset(info, 0, sizeof(*info)); + + if (!(hmem = GlobalAlloc(0, wcslen(xml) * sizeof(WCHAR)))) + return E_OUTOFMEMORY; + + buf = GlobalLock(hmem); + memcpy(buf, xml, lstrlenW(xml) * sizeof(WCHAR)); + GlobalUnlock(hmem); + + if (FAILED(hr = CreateStreamOnHGlobal(hmem, TRUE, &stream))) + { + GlobalFree(hmem); + return hr; + } + + if (FAILED(hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL))) + { + IStream_Release(stream); + return hr; + } + + if (FAILED(hr = IXmlReader_SetInput(reader, (IUnknown *)stream))) + goto done; + + while (IXmlReader_Read(reader, &type) == S_OK) + { + if (type != XmlNodeType_Element) continue; + if (FAILED(hr = IXmlReader_GetLocalName(reader, &name, NULL))) + goto done; + + TRACE("Element: %s\n", debugstr_w(name)); + if (wcscmp(name, L"Task")) + continue; + + hr = read_task_info(reader, info); + break; + } + +done: + IXmlReader_Release(reader); + IStream_Release(stream); + if (FAILED(hr)) + { + WARN("Failed parsing xml, hr %#lx.\n", hr); + return SCHED_E_MALFORMEDXML; + } + return S_OK; +} + HRESULT __cdecl SchRpcRetrieveTask(const WCHAR *path, const WCHAR *languages, ULONG *n_languages, WCHAR **xml) { WCHAR *full_name; @@ -685,6 +901,7 @@ HRESULT __cdecl SchRpcGetLastRunInfo(const WCHAR *path, SYSTEMTIME *last_runtime HRESULT __cdecl SchRpcGetTaskInfo(const WCHAR *path, DWORD flags, DWORD *enabled, DWORD *task_state) { WCHAR *full_name, *xml; + struct task_info info; HRESULT hr; FIXME("%s,%#lx,%p,%p: stub\n", debugstr_w(path), flags, enabled, task_state); @@ -695,10 +912,15 @@ HRESULT __cdecl SchRpcGetTaskInfo(const WCHAR *path, DWORD flags, DWORD *enabled hr = read_xml(full_name, &xml); heap_free(full_name); if (hr != S_OK) return hr; + hr = read_task_info_from_xml(xml, &info); heap_free(xml); + if (FAILED(hr)) return hr; - *enabled = 0; - *task_state = (flags & SCH_FLAG_STATE) ? TASK_STATE_DISABLED : TASK_STATE_UNKNOWN; + *enabled = info.enabled; + if (flags & SCH_FLAG_STATE) + *task_state = *enabled ? TASK_STATE_READY : TASK_STATE_DISABLED; + else + *task_state = TASK_STATE_UNKNOWN; return S_OK; } diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 4a97d831795..e2f985650e0 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -860,11 +860,9 @@ static void test_GetTask(void) SysFreeString(bstr); hr = IRegisteredTask_get_State(task2, &state); ok(hr == S_OK, "get_State error %#lx\n", hr); - todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); hr = IRegisteredTask_get_Enabled(task2, &vbool); ok(hr == S_OK, "get_Enabled error %#lx\n", hr); - todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); IRegisteredTask_Release(task2); @@ -919,11 +917,9 @@ static void test_GetTask(void) SysFreeString(bstr); hr = IRegisteredTask_get_State(task2, &state); ok(hr == S_OK, "get_State error %#lx\n", hr); - todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); hr = IRegisteredTask_get_Enabled(task2, &vbool); ok(hr == S_OK, "get_Enabled error %#lx\n", hr); - todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); hr = IRegisteredTask_get_State(task2, NULL);

1 0