wine-devel

wine-devel@winehq.org

3 participants
84483 discussions

[PATCH] taskschd: Use wide-char string literals.
by Michael Stefaniuc 16 Nov '20

16 Nov '20

Also merge some strings. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/taskschd/folder.c | 5 +- dlls/taskschd/regtask.c | 3 +- dlls/taskschd/task.c | 297 ++++++++++++++-------------------------- 3 files changed, 108 insertions(+), 197 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index eea404acd27..8b2630f4ec3 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -203,7 +203,6 @@ static HRESULT WINAPI TaskFolder_CreateFolder(ITaskFolder *iface, BSTR path, VAR WCHAR *get_full_path(const WCHAR *parent, const WCHAR *path) { - static const WCHAR bslash[] = { '\\', 0 }; WCHAR *folder_path; int len = 0; @@ -224,7 +223,7 @@ WCHAR *get_full_path(const WCHAR *parent, const WCHAR *path) { len = lstrlenW(folder_path); if (!len || folder_path[len - 1] != '\\') - lstrcatW(folder_path, bslash); + lstrcatW(folder_path, L"\\"); while (*path == '\\') path++; lstrcatW(folder_path, path); @@ -232,7 +231,7 @@ WCHAR *get_full_path(const WCHAR *parent, const WCHAR *path) len = lstrlenW(folder_path); if (!len) - lstrcatW(folder_path, bslash); + lstrcatW(folder_path, L"\\"); return folder_path; } diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index b5d726920cf..0b4b5717657 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -357,11 +357,10 @@ HRESULT RegisteredTask_create(const WCHAR *path, const WCHAR *name, ITaskDefinit } else { - static const WCHAR languages[] = { 0 }; DWORD count = 0; WCHAR *xml = NULL; - hr = SchRpcRetrieveTask(full_name, languages, &count, &xml); + hr = SchRpcRetrieveTask(full_name, L"", &count, &xml); if (hr != S_OK || (hr = ITaskDefinition_put_XmlText(definition, xml)) != S_OK) { heap_free(full_name); diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 8d81a18b3f5..dd7380e75ac 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1440,7 +1440,6 @@ static const ITaskSettingsVtbl TaskSettings_vtbl = static HRESULT TaskSettings_create(ITaskSettings **obj) { - static const WCHAR exec_time_limit[] = { 'P','T','7','2','H',0 }; TaskSettings *taskset; taskset = heap_alloc(sizeof(*taskset)); @@ -1450,7 +1449,7 @@ static HRESULT TaskSettings_create(ITaskSettings **obj) taskset->ref = 1; /* set the defaults */ taskset->restart_interval = NULL; - taskset->execution_time_limit = heap_strdupW(exec_time_limit); + taskset->execution_time_limit = heap_strdupW(L"PT72H"); taskset->delete_expired_task_after = NULL; taskset->restart_count = 0; taskset->priority = 7; @@ -2398,56 +2397,6 @@ static HRESULT WINAPI TaskDefinition_put_Actions(ITaskDefinition *iface, IAction return S_OK; } -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}; -static const WCHAR v1_1[] = {'1','.','1',0}; -static const WCHAR v1_2[] = {'1','.','2',0}; -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 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}; -static const WCHAR principalW[] = {'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}; -static const WCHAR actionsW[] = {'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}; -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}; -static const WCHAR WakeToRun[] = {'W','a','k','e','T','o','R','u','n',0}; -static const WCHAR ExecutionTimeLimit[] = {'E','x','e','c','u','t','i','o','n','T','i','m','e','L','i','m','i','t',0}; -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) @@ -2467,59 +2416,45 @@ static inline HRESULT write_stringW(IStream *stream, const WCHAR *str) 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); + write_stringW(stream, L" "); } -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 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) { write_indent(stream); - write_stringW(stream, start_element); + write_stringW(stream, L"<"); write_stringW(stream, name); - write_stringW(stream, end_empty_element); - return write_stringW(stream, eol); + return write_stringW(stream, L"/>\n"); } static inline HRESULT write_element(IStream *stream, const WCHAR *name) { write_indent(stream); - write_stringW(stream, start_element); + write_stringW(stream, L"<"); write_stringW(stream, name); - write_stringW(stream, close_element); - return write_stringW(stream, eol); + return write_stringW(stream, L">\n"); } static inline HRESULT write_element_end(IStream *stream, const WCHAR *name) { write_indent(stream); - write_stringW(stream, start_end_element); + write_stringW(stream, L"</"); write_stringW(stream, name); - write_stringW(stream, close_element); - return write_stringW(stream, eol); + return write_stringW(stream, L">\n"); } 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, L"<"); write_stringW(stream, name); - write_stringW(stream, close_element); + write_stringW(stream, L">"); write_stringW(stream, value); - write_stringW(stream, start_end_element); + write_stringW(stream, L"</"); write_stringW(stream, name); - write_stringW(stream, close_element); - return write_stringW(stream, eol); + return write_stringW(stream, L">\n"); } static HRESULT write_task_attributes(IStream *stream, ITaskDefinition *taskdef) @@ -2540,35 +2475,23 @@ static HRESULT write_task_attributes(IStream *stream, ITaskDefinition *taskdef) switch (level) { case TASK_COMPATIBILITY_AT: - compatibility = v1_0; + compatibility = L"1.0"; break; case TASK_COMPATIBILITY_V1: - compatibility = v1_1; + compatibility = L"1.1"; break; case TASK_COMPATIBILITY_V2: - compatibility = v1_2; + compatibility = L"1.2"; break; default: - compatibility = v1_3; + compatibility = L"1.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, L"<Task version=\""); 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); + write_stringW(stream, L"\" xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">"); + return write_stringW(stream, L"\n"); } static HRESULT write_registration_info(IStream *stream, IRegistrationInfo *reginfo) @@ -2578,9 +2501,9 @@ static HRESULT write_registration_info(IStream *stream, IRegistrationInfo *regin VARIANT var; if (!reginfo) - return write_empty_element(stream, RegistrationInfo); + return write_empty_element(stream, L"RegistrationInfo"); - hr = write_element(stream, RegistrationInfo); + hr = write_element(stream, L"RegistrationInfo"); if (hr != S_OK) return hr; push_indent(); @@ -2588,49 +2511,49 @@ static HRESULT write_registration_info(IStream *stream, IRegistrationInfo *regin hr = IRegistrationInfo_get_Source(reginfo, &bstr); if (hr == S_OK && bstr) { - hr = write_text_value(stream, Source, bstr); + hr = write_text_value(stream, L"Source", bstr); SysFreeString(bstr); if (hr != S_OK) return hr; } hr = IRegistrationInfo_get_Date(reginfo, &bstr); if (hr == S_OK && bstr) { - hr = write_text_value(stream, Date, bstr); + hr = write_text_value(stream, L"Date", bstr); SysFreeString(bstr); if (hr != S_OK) return hr; } hr = IRegistrationInfo_get_Author(reginfo, &bstr); if (hr == S_OK && bstr) { - hr = write_text_value(stream, Author, bstr); + hr = write_text_value(stream, L"Author", bstr); SysFreeString(bstr); if (hr != S_OK) return hr; } hr = IRegistrationInfo_get_Version(reginfo, &bstr); if (hr == S_OK && bstr) { - hr = write_text_value(stream, Version, bstr); + hr = write_text_value(stream, L"Version", bstr); SysFreeString(bstr); if (hr != S_OK) return hr; } hr = IRegistrationInfo_get_Description(reginfo, &bstr); if (hr == S_OK && bstr) { - hr = write_text_value(stream, Description, bstr); + hr = write_text_value(stream, L"Description", bstr); SysFreeString(bstr); if (hr != S_OK) return hr; } hr = IRegistrationInfo_get_Documentation(reginfo, &bstr); if (hr == S_OK && bstr) { - hr = write_text_value(stream, Documentation, bstr); + hr = write_text_value(stream, L"Documentation", bstr); SysFreeString(bstr); if (hr != S_OK) return hr; } hr = IRegistrationInfo_get_URI(reginfo, &bstr); if (hr == S_OK && bstr) { - hr = write_text_value(stream, URI, bstr); + hr = write_text_value(stream, L"URI", bstr); SysFreeString(bstr); if (hr != S_OK) return hr; } @@ -2639,7 +2562,7 @@ static HRESULT write_registration_info(IStream *stream, IRegistrationInfo *regin { if (V_VT(&var) == VT_BSTR) { - hr = write_text_value(stream, SecurityDescriptor, V_BSTR(&var)); + hr = write_text_value(stream, L"SecurityDescriptor", V_BSTR(&var)); VariantClear(&var); if (hr != S_OK) return hr; } @@ -2649,7 +2572,7 @@ static HRESULT write_registration_info(IStream *stream, IRegistrationInfo *regin pop_indent(); - return write_element_end(stream, RegistrationInfo); + return write_element_end(stream, L"RegistrationInfo"); } static HRESULT write_principal(IStream *stream, IPrincipal *principal) @@ -2660,9 +2583,9 @@ static HRESULT write_principal(IStream *stream, IPrincipal *principal) TASK_RUNLEVEL_TYPE level; if (!principal) - return write_empty_element(stream, Principals); + return write_empty_element(stream, L"Principals"); - hr = write_element(stream, Principals); + hr = write_element(stream, L"Principals"); if (hr != S_OK) return hr; push_indent(); @@ -2671,41 +2594,34 @@ static HRESULT write_principal(IStream *stream, IPrincipal *principal) if (hr == S_OK) { write_indent(stream); - write_stringW(stream, start_element); - write_stringW(stream, principalW); - write_stringW(stream, spaceW); - write_stringW(stream, id); - write_stringW(stream, equalW); - write_stringW(stream, quoteW); + write_stringW(stream, L"<Principal id=\""); write_stringW(stream, bstr); - write_stringW(stream, quoteW); - write_stringW(stream, close_element); - write_stringW(stream, eol); + write_stringW(stream, L"\">\n"); SysFreeString(bstr); } else - write_element(stream, principalW); + write_element(stream, L"Principal"); push_indent(); hr = IPrincipal_get_GroupId(principal, &bstr); if (hr == S_OK) { - hr = write_text_value(stream, GroupId, bstr); + hr = write_text_value(stream, L"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); + hr = write_text_value(stream, L"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); + hr = write_text_value(stream, L"UserId", bstr); SysFreeString(bstr); if (hr != S_OK) return hr; } @@ -2717,10 +2633,10 @@ static HRESULT write_principal(IStream *stream, IPrincipal *principal) switch (level) { case TASK_RUNLEVEL_HIGHEST: - level_str = HighestAvailable; + level_str = L"HighestAvailable"; break; case TASK_RUNLEVEL_LUA: - level_str = LeastPrivilege; + level_str = L"LeastPrivilege"; break; default: FIXME("Principal run level %d\n", level); @@ -2729,7 +2645,7 @@ static HRESULT write_principal(IStream *stream, IPrincipal *principal) if (level_str) { - hr = write_text_value(stream, RunLevel, level_str); + hr = write_text_value(stream, L"RunLevel", level_str); if (hr != S_OK) return hr; } } @@ -2741,13 +2657,13 @@ static HRESULT write_principal(IStream *stream, IPrincipal *principal) switch (logon) { case TASK_LOGON_PASSWORD: - logon_str = Password; + logon_str = L"Password"; break; case TASK_LOGON_S4U: - logon_str = S4U; + logon_str = L"S4U"; break; case TASK_LOGON_INTERACTIVE_TOKEN: - logon_str = InteractiveToken; + logon_str = L"InteractiveToken"; break; default: FIXME("Principal logon type %d\n", logon); @@ -2756,22 +2672,22 @@ static HRESULT write_principal(IStream *stream, IPrincipal *principal) if (logon_str) { - hr = write_text_value(stream, LogonType, logon_str); + hr = write_text_value(stream, L"LogonType", logon_str); if (hr != S_OK) return hr; } } pop_indent(); - write_element_end(stream, principalW); + write_element_end(stream, L"Principal"); pop_indent(); - return write_element_end(stream, Principals); + return write_element_end(stream, L"Principals"); } static HRESULT write_settings(IStream *stream, ITaskSettings *settings) { if (!settings) - return write_empty_element(stream, Settings); + return write_empty_element(stream, L"Settings"); FIXME("stub\n"); return S_OK; @@ -2780,7 +2696,7 @@ static HRESULT write_settings(IStream *stream, ITaskSettings *settings) static HRESULT write_triggers(IStream *stream, ITriggerCollection *triggers) { if (!triggers) - return write_empty_element(stream, Triggers); + return write_empty_element(stream, L"Triggers"); FIXME("stub\n"); return S_OK; @@ -2790,11 +2706,11 @@ static HRESULT write_actions(IStream *stream, IActionCollection *actions) { if (!actions) { - write_element(stream, actionsW); + write_element(stream, L"Actions"); push_indent(); - write_empty_element(stream, Exec); + write_empty_element(stream, L"Exec"); pop_indent(); - return write_element_end(stream, actionsW); + return write_element_end(stream, L"Actions"); } FIXME("stub\n"); @@ -2843,7 +2759,7 @@ static HRESULT WINAPI TaskDefinition_get_XmlText(ITaskDefinition *iface, BSTR *x pop_indent(); - write_element_end(stream, Task); + write_element_end(stream, L"Task"); IStream_Write(stream, "\0\0", 2, NULL); p = GlobalLock(hmem); @@ -2889,17 +2805,15 @@ static HRESULT read_text_value(IXmlReader *reader, WCHAR **value) static HRESULT read_variantbool_value(IXmlReader *reader, VARIANT_BOOL *vbool) { - static const WCHAR trueW[] = {'t','r','u','e',0}; - static const WCHAR falseW[] = {'f','a','l','s','e',0}; HRESULT hr; WCHAR *value; hr = read_text_value(reader, &value); if (hr != S_OK) return hr; - if (!lstrcmpW(value, trueW)) + if (!lstrcmpW(value, L"true")) *vbool = VARIANT_TRUE; - else if (!lstrcmpW(value, falseW)) + else if (!lstrcmpW(value, L"false")) *vbool = VARIANT_FALSE; else { @@ -2947,7 +2861,7 @@ static HRESULT read_principal_attributes(IXmlReader *reader, IPrincipal *princip TRACE("%s=%s\n", debugstr_w(name), debugstr_w(value)); - if (!lstrcmpW(name, id)) + if (!lstrcmpW(name, L"id")) IPrincipal_put_Id(principal, (BSTR)value); else FIXME("unhandled Principal attribute %s\n", debugstr_w(name)); @@ -2983,7 +2897,7 @@ static HRESULT read_principal(IXmlReader *reader, IPrincipal *principal) TRACE("/%s\n", debugstr_w(name)); - if (!lstrcmpW(name, principalW)) + if (!lstrcmpW(name, L"Principal")) return S_OK; break; @@ -2994,20 +2908,20 @@ static HRESULT read_principal(IXmlReader *reader, IPrincipal *principal) TRACE("Element: %s\n", debugstr_w(name)); - if (!lstrcmpW(name, UserId)) + if (!lstrcmpW(name, L"UserId")) { hr = read_text_value(reader, &value); if (hr == S_OK) IPrincipal_put_UserId(principal, value); } - else if (!lstrcmpW(name, LogonType)) + else if (!lstrcmpW(name, L"LogonType")) { hr = read_text_value(reader, &value); if (hr == S_OK) { TASK_LOGON_TYPE logon = TASK_LOGON_NONE; - if (!lstrcmpW(value, InteractiveToken)) + if (!lstrcmpW(value, L"InteractiveToken")) logon = TASK_LOGON_INTERACTIVE_TOKEN; else FIXME("unhandled LogonType %s\n", debugstr_w(value)); @@ -3015,14 +2929,14 @@ static HRESULT read_principal(IXmlReader *reader, IPrincipal *principal) IPrincipal_put_LogonType(principal, logon); } } - else if (!lstrcmpW(name, RunLevel)) + else if (!lstrcmpW(name, L"RunLevel")) { hr = read_text_value(reader, &value); if (hr == S_OK) { TASK_RUNLEVEL_TYPE level = TASK_RUNLEVEL_LUA; - if (!lstrcmpW(value, LeastPrivilege)) + if (!lstrcmpW(value, L"LeastPrivilege")) level = TASK_RUNLEVEL_LUA; else FIXME("unhandled RunLevel %s\n", debugstr_w(value)); @@ -3071,7 +2985,7 @@ static HRESULT read_principals(IXmlReader *reader, ITaskDefinition *taskdef) TRACE("/%s\n", debugstr_w(name)); - if (!lstrcmpW(name, Principals)) + if (!lstrcmpW(name, L"Principals")) return S_OK; break; @@ -3082,7 +2996,7 @@ static HRESULT read_principals(IXmlReader *reader, ITaskDefinition *taskdef) TRACE("Element: %s\n", debugstr_w(name)); - if (!lstrcmpW(name, principalW)) + if (!lstrcmpW(name, L"Principal")) { IPrincipal *principal; @@ -3147,7 +3061,7 @@ static HRESULT read_settings(IXmlReader *reader, ITaskSettings *taskset) TRACE("/%s\n", debugstr_w(name)); - if (!lstrcmpW(name, Settings)) + if (!lstrcmpW(name, L"Settings")) return S_OK; break; @@ -3158,14 +3072,14 @@ static HRESULT read_settings(IXmlReader *reader, ITaskSettings *taskset) TRACE("Element: %s\n", debugstr_w(name)); - if (!lstrcmpW(name, MultipleInstancesPolicy)) + if (!lstrcmpW(name, L"MultipleInstancesPolicy")) { hr = read_text_value(reader, &value); if (hr == S_OK) { int_val = TASK_INSTANCES_IGNORE_NEW; - if (!lstrcmpW(value, IgnoreNew)) + if (!lstrcmpW(value, L"IgnoreNew")) int_val = TASK_INSTANCES_IGNORE_NEW; else FIXME("unhandled MultipleInstancesPolicy %s\n", debugstr_w(value)); @@ -3173,79 +3087,79 @@ static HRESULT read_settings(IXmlReader *reader, ITaskSettings *taskset) ITaskSettings_put_MultipleInstances(taskset, int_val); } } - else if (!lstrcmpW(name, DisallowStartIfOnBatteries)) + else if (!lstrcmpW(name, L"DisallowStartIfOnBatteries")) { hr = read_variantbool_value(reader, &bool_val); if (hr != S_OK) return hr; ITaskSettings_put_DisallowStartIfOnBatteries(taskset, bool_val); } - else if (!lstrcmpW(name, AllowStartOnDemand)) + else if (!lstrcmpW(name, L"AllowStartOnDemand")) { hr = read_variantbool_value(reader, &bool_val); if (hr != S_OK) return hr; ITaskSettings_put_AllowDemandStart(taskset, bool_val); } - else if (!lstrcmpW(name, StopIfGoingOnBatteries)) + else if (!lstrcmpW(name, L"StopIfGoingOnBatteries")) { hr = read_variantbool_value(reader, &bool_val); if (hr != S_OK) return hr; ITaskSettings_put_StopIfGoingOnBatteries(taskset, bool_val); } - else if (!lstrcmpW(name, AllowHardTerminate)) + else if (!lstrcmpW(name, L"AllowHardTerminate")) { hr = read_variantbool_value(reader, &bool_val); if (hr != S_OK) return hr; ITaskSettings_put_AllowHardTerminate(taskset, bool_val); } - else if (!lstrcmpW(name, StartWhenAvailable)) + else if (!lstrcmpW(name, L"StartWhenAvailable")) { hr = read_variantbool_value(reader, &bool_val); if (hr != S_OK) return hr; ITaskSettings_put_StartWhenAvailable(taskset, bool_val); } - else if (!lstrcmpW(name, RunOnlyIfNetworkAvailable)) + else if (!lstrcmpW(name, L"RunOnlyIfNetworkAvailable")) { hr = read_variantbool_value(reader, &bool_val); if (hr != S_OK) return hr; ITaskSettings_put_RunOnlyIfNetworkAvailable(taskset, bool_val); } - else if (!lstrcmpW(name, Enabled)) + else if (!lstrcmpW(name, L"Enabled")) { hr = read_variantbool_value(reader, &bool_val); if (hr != S_OK) return hr; ITaskSettings_put_Enabled(taskset, bool_val); } - else if (!lstrcmpW(name, Hidden)) + else if (!lstrcmpW(name, L"Hidden")) { hr = read_variantbool_value(reader, &bool_val); if (hr != S_OK) return hr; ITaskSettings_put_Hidden(taskset, bool_val); } - else if (!lstrcmpW(name, RunOnlyIfIdle)) + else if (!lstrcmpW(name, L"RunOnlyIfIdle")) { hr = read_variantbool_value(reader, &bool_val); if (hr != S_OK) return hr; ITaskSettings_put_RunOnlyIfIdle(taskset, bool_val); } - else if (!lstrcmpW(name, WakeToRun)) + else if (!lstrcmpW(name, L"WakeToRun")) { hr = read_variantbool_value(reader, &bool_val); if (hr != S_OK) return hr; ITaskSettings_put_WakeToRun(taskset, bool_val); } - else if (!lstrcmpW(name, ExecutionTimeLimit)) + else if (!lstrcmpW(name, L"ExecutionTimeLimit")) { hr = read_text_value(reader, &value); if (hr == S_OK) ITaskSettings_put_ExecutionTimeLimit(taskset, value); } - else if (!lstrcmpW(name, Priority)) + else if (!lstrcmpW(name, L"Priority")) { hr = read_int_value(reader, &int_val); if (hr == S_OK) ITaskSettings_put_Priority(taskset, int_val); } - else if (!lstrcmpW(name, IdleSettings)) + else if (!lstrcmpW(name, L"IdleSettings")) { hr = read_idle_settings(reader, taskset); if (hr != S_OK) return hr; @@ -3292,7 +3206,7 @@ static HRESULT read_registration_info(IXmlReader *reader, IRegistrationInfo *inf TRACE("/%s\n", debugstr_w(name)); - if (!lstrcmpW(name, RegistrationInfo)) + if (!lstrcmpW(name, L"RegistrationInfo")) return S_OK; break; @@ -3303,43 +3217,43 @@ static HRESULT read_registration_info(IXmlReader *reader, IRegistrationInfo *inf TRACE("Element: %s\n", debugstr_w(name)); - if (!lstrcmpW(name, Author)) + if (!lstrcmpW(name, L"Author")) { hr = read_text_value(reader, &value); if (hr == S_OK) IRegistrationInfo_put_Author(info, value); } - else if (!lstrcmpW(name, Description)) + else if (!lstrcmpW(name, L"Description")) { hr = read_text_value(reader, &value); if (hr == S_OK) IRegistrationInfo_put_Description(info, value); } - else if (!lstrcmpW(name, Version)) + else if (!lstrcmpW(name, L"Version")) { hr = read_text_value(reader, &value); if (hr == S_OK) IRegistrationInfo_put_Version(info, value); } - else if (!lstrcmpW(name, Date)) + else if (!lstrcmpW(name, L"Date")) { hr = read_text_value(reader, &value); if (hr == S_OK) IRegistrationInfo_put_Date(info, value); } - else if (!lstrcmpW(name, Documentation)) + else if (!lstrcmpW(name, L"Documentation")) { hr = read_text_value(reader, &value); if (hr == S_OK) IRegistrationInfo_put_Documentation(info, value); } - else if (!lstrcmpW(name, URI)) + else if (!lstrcmpW(name, L"URI")) { hr = read_text_value(reader, &value); if (hr == S_OK) IRegistrationInfo_put_URI(info, value); } - else if (!lstrcmpW(name, Source)) + else if (!lstrcmpW(name, L"Source")) { hr = read_text_value(reader, &value); if (hr == S_OK) @@ -3389,26 +3303,26 @@ static HRESULT read_task_attributes(IXmlReader *reader, ITaskDefinition *taskdef TRACE("%s=%s\n", debugstr_w(name), debugstr_w(value)); - if (!lstrcmpW(name, version)) + if (!lstrcmpW(name, L"version")) { TASK_COMPATIBILITY compatibility = TASK_COMPATIBILITY_V2; - if (!lstrcmpW(value, v1_0)) + if (!lstrcmpW(value, L"1.0")) compatibility = TASK_COMPATIBILITY_AT; - else if (!lstrcmpW(value, v1_1)) + else if (!lstrcmpW(value, L"1.1")) compatibility = TASK_COMPATIBILITY_V1; - else if (!lstrcmpW(value, v1_2)) + else if (!lstrcmpW(value, L"1.2")) compatibility = TASK_COMPATIBILITY_V2; - else if (!lstrcmpW(value, v1_3)) + else if (!lstrcmpW(value, L"1.3")) compatibility = TASK_COMPATIBILITY_V2_1; else FIXME("unknown version %s\n", debugstr_w(value)); ITaskSettings_put_Compatibility(taskset, compatibility); } - else if (!lstrcmpW(name, xmlns)) + else if (!lstrcmpW(name, L"xmlns")) { - if (lstrcmpW(value, task_ns)) + if (lstrcmpW(value, L"http://schemas.microsoft.com/windows/2004/02/mit/task")) { FIXME("unknown namespace %s\n", debugstr_w(value)); break; @@ -3447,7 +3361,7 @@ static HRESULT read_task(IXmlReader *reader, ITaskDefinition *taskdef) TRACE("/%s\n", debugstr_w(name)); - if (!lstrcmpW(name, Task)) + if (!lstrcmpW(name, L"Task")) return S_OK; break; @@ -3458,7 +3372,7 @@ static HRESULT read_task(IXmlReader *reader, ITaskDefinition *taskdef) TRACE("Element: %s\n", debugstr_w(name)); - if (!lstrcmpW(name, RegistrationInfo)) + if (!lstrcmpW(name, L"RegistrationInfo")) { IRegistrationInfo *info; @@ -3467,7 +3381,7 @@ static HRESULT read_task(IXmlReader *reader, ITaskDefinition *taskdef) hr = read_registration_info(reader, info); IRegistrationInfo_Release(info); } - else if (!lstrcmpW(name, Settings)) + else if (!lstrcmpW(name, L"Settings")) { ITaskSettings *taskset; @@ -3476,11 +3390,11 @@ static HRESULT read_task(IXmlReader *reader, ITaskDefinition *taskdef) hr = read_settings(reader, taskset); ITaskSettings_Release(taskset); } - else if (!lstrcmpW(name, Triggers)) + else if (!lstrcmpW(name, L"Triggers")) hr = read_triggers(reader, taskdef); - else if (!lstrcmpW(name, Principals)) + else if (!lstrcmpW(name, L"Principals")) hr = read_principals(reader, taskdef); - else if (!lstrcmpW(name, actionsW)) + else if (!lstrcmpW(name, L"Actions")) hr = read_actions(reader, taskdef); else FIXME("unhandled Task element %s\n", debugstr_w(name)); @@ -3522,7 +3436,7 @@ static HRESULT read_xml(IXmlReader *reader, ITaskDefinition *taskdef) TRACE("Element: %s\n", debugstr_w(name)); - if (!lstrcmpW(name, Task)) + if (!lstrcmpW(name, L"Task")) { hr = read_task_attributes(reader, taskdef); if (hr != S_OK) return hr; @@ -3782,18 +3696,17 @@ static inline BOOL is_variant_null(const VARIANT *var) static HRESULT start_schedsvc(void) { - static const WCHAR scheduleW[] = { 'S','c','h','e','d','u','l','e',0 }; SC_HANDLE scm, service; SERVICE_STATUS_PROCESS status; ULONGLONG start_time; HRESULT hr = SCHED_E_SERVICE_NOT_RUNNING; - TRACE("Trying to start %s service\n", debugstr_w(scheduleW)); + TRACE("Trying to start Schedule service\n"); scm = OpenSCManagerW(NULL, NULL, 0); if (!scm) return SCHED_E_SERVICE_NOT_INSTALLED; - service = OpenServiceW(scm, scheduleW, SERVICE_START | SERVICE_QUERY_STATUS); + service = OpenServiceW(scm, L"Schedule", SERVICE_START | SERVICE_QUERY_STATUS); if (service) { if (StartServiceW(service, 0, NULL) || GetLastError() == ERROR_SERVICE_ALREADY_RUNNING) @@ -3837,7 +3750,7 @@ static HRESULT start_schedsvc(void) static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, VARIANT user, VARIANT domain, VARIANT password) { - static WCHAR ncalrpc[] = { 'n','c','a','l','r','p','c',0 }; + static WCHAR ncalrpc[] = L"ncalrpc"; TaskService *task_svc = impl_from_ITaskService(iface); WCHAR comp_name[MAX_COMPUTERNAME_LENGTH + 1]; DWORD len; -- 2.26.2

1 0

[PATCH v2] ntdll: Avoid overwriting parameters with context in call_user_apc_dispatcher() on x86.
by Paul Gofman 16 Nov '20

16 Nov '20

Fixes crash in 32 bit kernel32 file test. The crash is not always reproducible as the issue depends on stack layout. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - remove leftover debug changes. dlls/ntdll/unix/signal_i386.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 4d8eeb2072c..58b79940773 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1688,15 +1688,18 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "movl %esp,%ebx\n\t" "cmpl %esp,%esi\n\t" "cmovbl %esi,%esp\n\t" + "pushl 20(%ebx)\n\t" /* func */ + "pushl 16(%ebx)\n\t" /* arg2 */ + "pushl 12(%ebx)\n\t" /* arg1 */ + "movl 8(%ebx),%ebx\n\t" /* ctx */ "movl $0x00010007,(%esi)\n\t" /* context.ContextFlags = CONTEXT_FULL */ "pushl %esi\n\t" /* context */ "pushl $0xfffffffe\n\t" "call " __ASM_STDCALL("NtGetContextThread",8) "\n\t" "movl $0xc0,0xb0(%esi)\n" /* context.Eax = STATUS_USER_APC */ - "movl 20(%ebx),%eax\n\t" /* func */ - "movl 16(%ebx),%ecx\n\t" /* arg2 */ - "movl 12(%ebx),%edx\n\t" /* arg1 */ - "movl 8(%ebx),%ebx\n\t" /* ctx */ + "popl %edx\n\t" + "popl %ecx\n\t" + "popl %eax\n\t" "leal -20(%esi),%esp\n\t" "movl %eax,16(%esp)\n" /* func */ "2:\tmovl %ecx,12(%esp)\n\t" /* arg2 */ -- 2.28.0

2 1

[PATCH] mf/session: Call session_command_complete after NotifyTopology command.
by Derek Lesho 16 Nov '20

16 Nov '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/mf/session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index cf351c003e7..dffd5113ff9 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2075,6 +2075,7 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, break; case SESSION_CMD_QM_NOTIFY_TOPOLOGY: IMFQualityManager_NotifyTopology(session->quality_manager, op->u.notify_topology.topology); + session_command_complete(session); break; case SESSION_CMD_SA_READY: topo_node = session_get_node_by_id(session, op->u.sa_ready.node_id); -- 2.29.2

2 1

[PATCH v2 1/4] server: Allow named pipes creation with device file as root directory.
by Paul Gofman 16 Nov '20

16 Nov '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - Do not require directrory parent in get_req_object_attributes(). dlls/ntdll/tests/pipe.c | 34 ++++++++++++++++++++++++++++++++-- server/named_pipe.c | 2 +- server/object.h | 2 +- server/request.c | 9 ++++++++- server/symlink.c | 6 ++++++ 5 files changed, 48 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 9e8b623d75b..bfc8dc0b3be 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -65,6 +65,7 @@ typedef struct { #endif static NTSTATUS (WINAPI *pNtFsControlFile) (HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, PVOID apc_context, PIO_STATUS_BLOCK io, ULONG code, PVOID in_buffer, ULONG in_size, PVOID out_buffer, ULONG out_size); +static NTSTATUS (WINAPI *pNtCreateDirectoryObject)(HANDLE *, ACCESS_MASK, OBJECT_ATTRIBUTES *); static NTSTATUS (WINAPI *pNtCreateNamedPipeFile) (PHANDLE handle, ULONG access, POBJECT_ATTRIBUTES attr, PIO_STATUS_BLOCK iosb, ULONG sharing, ULONG dispo, ULONG options, @@ -73,6 +74,7 @@ static NTSTATUS (WINAPI *pNtCreateNamedPipeFile) (PHANDLE handle, ULONG access, ULONG inbound_quota, ULONG outbound_quota, PLARGE_INTEGER timeout); static NTSTATUS (WINAPI *pNtQueryInformationFile) (IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock, OUT PVOID FileInformation, IN ULONG Length, IN FILE_INFORMATION_CLASS FileInformationClass); +static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE, OBJECT_INFORMATION_CLASS, void *, ULONG, ULONG *); static NTSTATUS (WINAPI *pNtQueryVolumeInformationFile)(HANDLE handle, PIO_STATUS_BLOCK io, void *buffer, ULONG length, FS_INFORMATION_CLASS info_class); static NTSTATUS (WINAPI *pNtSetInformationFile) (HANDLE handle, PIO_STATUS_BLOCK io, PVOID ptr, ULONG len, FILE_INFORMATION_CLASS class); static NTSTATUS (WINAPI *pNtCancelIoFile) (HANDLE hFile, PIO_STATUS_BLOCK io_status); @@ -94,8 +96,10 @@ static BOOL init_func_ptrs(void) } loadfunc(NtFsControlFile) + loadfunc(NtCreateDirectoryObject) loadfunc(NtCreateNamedPipeFile) loadfunc(NtQueryInformationFile) + loadfunc(NtQueryObject) loadfunc(NtQueryVolumeInformationFile) loadfunc(NtSetInformationFile) loadfunc(NtCancelIoFile) @@ -2405,14 +2409,20 @@ static void test_security_info(void) static void test_empty_name(void) { HANDLE hdirectory, hpipe, hwrite, handle; + OBJECT_TYPE_INFORMATION *type_info; + OBJECT_NAME_INFORMATION *name_info; OBJECT_ATTRIBUTES attr; LARGE_INTEGER timeout; UNICODE_STRING name; IO_STATUS_BLOCK io; DWORD data, length; + char buffer[1024]; NTSTATUS status; BOOL ret; + type_info = (OBJECT_TYPE_INFORMATION *)buffer; + name_info = (OBJECT_NAME_INFORMATION *)buffer; + hpipe = hwrite = NULL; attr.Length = sizeof(attr); @@ -2438,13 +2448,17 @@ static void test_empty_name(void) &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_CREATE, FILE_SYNCHRONOUS_IO_NONALERT, 0, 0, 0, 3, 4096, 4096, &timeout); todo_wine ok(status == STATUS_OBJECT_NAME_INVALID, "Got unexpected status %#x.\n", status); - + if (!status) + CloseHandle(hpipe); CloseHandle(hdirectory); pRtlInitUnicodeString(&name, L"\\Device\\NamedPipe\\"); attr.RootDirectory = 0; attr.ObjectName = &name; + status = pNtCreateDirectoryObject(&hdirectory, GENERIC_READ | SYNCHRONIZE, &attr); + todo_wine ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#x.\n", status); + status = NtCreateFile(&hdirectory, GENERIC_READ | SYNCHRONIZE, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 ); ok(!status, "Got unexpected status %#x.\n", status); @@ -2454,10 +2468,18 @@ static void test_empty_name(void) name.MaximumLength = 0; attr.RootDirectory = hdirectory; + hpipe = NULL; status = pNtCreateNamedPipeFile(&hpipe, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_CREATE, FILE_SYNCHRONOUS_IO_NONALERT, 0, 0, 0, 3, 4096, 4096, &timeout); - todo_wine ok(!status, "Got unexpected status %#x.\n", status); + ok(!status, "Got unexpected status %#x.\n", status); + type_info->TypeName.Buffer = NULL; + status = pNtQueryObject(hpipe, ObjectTypeInformation, type_info, sizeof(buffer), NULL); + ok(!status, "Got unexpected status %#x.\n", status); + ok(type_info->TypeName.Buffer && !wcscmp(type_info->TypeName.Buffer, L"File"), + "Got unexpected type %s.\n", debugstr_w(type_info->TypeName.Buffer)); + status = pNtQueryObject(hpipe, ObjectNameInformation, name_info, sizeof(buffer), NULL); + todo_wine ok(status == STATUS_OBJECT_PATH_INVALID, "Got unexpected status %#x.\n", status); status = pNtCreateNamedPipeFile(&handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, @@ -2469,6 +2491,14 @@ static void test_empty_name(void) FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); todo_wine ok(!status, "Got unexpected status %#x.\n", status); + type_info->TypeName.Buffer = NULL; + status = pNtQueryObject(hwrite, ObjectTypeInformation, type_info, sizeof(buffer), NULL); + todo_wine ok(!status, "Got unexpected status %#x.\n", status); + todo_wine ok(type_info->TypeName.Buffer && !wcscmp(type_info->TypeName.Buffer, L"File"), + "Got unexpected type %s.\n", debugstr_w(type_info->TypeName.Buffer)); + status = pNtQueryObject(hwrite, ObjectNameInformation, name_info, sizeof(buffer), NULL); + todo_wine ok(status == STATUS_OBJECT_PATH_INVALID, "Got unexpected status %#x.\n", status); + attr.RootDirectory = hpipe; status = NtCreateFile(&handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, diff --git a/server/named_pipe.c b/server/named_pipe.c index 60bd059d93d..3a8cd2fb919 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1371,7 +1371,7 @@ DECL_HANDLER(create_named_pipe) set_error( STATUS_OBJECT_PATH_SYNTAX_BAD ); return; } - if (!(root = get_directory_obj( current->process, objattr->rootdir ))) return; + if (!(root = get_handle_obj( current->process, objattr->rootdir, 0, NULL ))) return; } pipe = create_named_object( root, &named_pipe_ops, &name, objattr->attributes | OBJ_OPENIF, NULL ); diff --git a/server/object.h b/server/object.h index 394a4aac463..678e1b8a3fc 100644 --- a/server/object.h +++ b/server/object.h @@ -253,7 +253,7 @@ extern struct object *create_obj_symlink( struct object *root, const struct unic extern struct object *create_symlink( struct object *root, const struct unicode_str *name, unsigned int attr, const struct unicode_str *target, const struct security_descriptor *sd ); - +extern BOOL is_symlink_obj( struct object *obj ); /* global variables */ /* command-line options */ diff --git a/server/request.c b/server/request.c index 97bf1a746d2..b1de1243c03 100644 --- a/server/request.c +++ b/server/request.c @@ -66,6 +66,7 @@ #include "process.h" #include "thread.h" #include "security.h" +#include "handle.h" #define WANT_REQUEST_HANDLERS #include "request.h" @@ -205,7 +206,13 @@ const struct object_attributes *get_req_object_attributes( const struct security } if (root && attr->rootdir && attr->name_len) { - if (!(*root = get_directory_obj( current->process, attr->rootdir ))) return NULL; + if (!(*root = get_handle_obj( current->process, attr->rootdir, 0, NULL ))) return NULL; + if (is_symlink_obj( *root )) + { + release_object( *root ); + set_error( STATUS_OBJECT_TYPE_MISMATCH ); + return NULL; + } } *sd = attr->sd_len ? (const struct security_descriptor *)(attr + 1) : NULL; name->len = attr->name_len; diff --git a/server/symlink.c b/server/symlink.c index b620f2accb9..ce90c0ebcb3 100644 --- a/server/symlink.c +++ b/server/symlink.c @@ -182,6 +182,12 @@ struct object *create_obj_symlink( struct object *root, const struct unicode_str } +BOOL is_symlink_obj( struct object *obj ) +{ + return obj->ops == &symlink_ops; +} + + /* create a symbolic link object */ DECL_HANDLER(create_symlink) { -- 2.28.0

2 5

[PATCH 1/5] amstream: Implement MediaStreamFilter::IsFormatSupported.
by Anton Baskanov 16 Nov '20

16 Nov '20

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/filter.c | 20 ++++- dlls/amstream/tests/amstream.c | 136 ++++++++++++++++++++++++++++++++- 2 files changed, 152 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 5fd5b2afdbc..3c0436a294f 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -848,9 +848,25 @@ static HRESULT WINAPI filter_seeking_CheckCapabilities(IMediaSeeking *iface, DWO static HRESULT WINAPI filter_seeking_IsFormatSupported(IMediaSeeking *iface, const GUID *format) { - FIXME("iface %p, format %s, stub!\n", iface, debugstr_guid(format)); + struct filter *filter = impl_from_IMediaSeeking(iface); + IMediaSeeking *seeking; + HRESULT hr; - return E_NOTIMPL; + TRACE("filter %p, format %s.\n", filter, debugstr_guid(format)); + + EnterCriticalSection(&filter->cs); + + seeking = get_seeking(filter->seekable_stream); + + LeaveCriticalSection(&filter->cs); + + if (!seeking) + return E_NOTIMPL; + + hr = IMediaSeeking_IsFormatSupported(seeking, format); + IMediaSeeking_Release(seeking); + + return hr; } static HRESULT WINAPI filter_seeking_QueryPreferredFormat(IMediaSeeking *iface, GUID *format) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index f5014395832..2e5d6bc92be 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -975,12 +975,14 @@ struct testfilter LONGLONG stop_position; const AM_MEDIA_TYPE *preferred_mt; HANDLE wait_state_event; + GUID is_format_supported_format; HRESULT get_duration_hr; HRESULT get_stop_position_hr; HRESULT set_positions_hr; HRESULT init_stream_hr; HRESULT cleanup_stream_hr; HRESULT wait_state_hr; + HRESULT is_format_supported_hr; }; static inline struct testfilter *impl_from_BaseFilter(struct strmbase_filter *iface) @@ -1168,8 +1170,11 @@ static HRESULT WINAPI testsource_seeking_CheckCapabilities(IMediaSeeking *iface, static HRESULT WINAPI testsource_seeking_IsFormatSupported(IMediaSeeking *iface, const GUID *format) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + struct testfilter *filter = impl_from_IMediaSeeking(iface); + + filter->is_format_supported_format = *format; + + return filter->is_format_supported_hr; } static HRESULT WINAPI testsource_seeking_QueryPreferredFormat(IMediaSeeking *iface, GUID *format) @@ -6926,6 +6931,132 @@ static void test_mediastreamfilter_wait_until(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_mediastreamfilter_is_format_supported(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + static const MSPID mspid1 = {0x88888888, 1}; + static const MSPID mspid2 = {0x88888888, 2}; + static const MSPID mspid3 = {0x88888888, 3}; + struct testfilter source1, source2, source3; + IAMMediaStream *stream1, *stream2, *stream3; + IMediaStreamFilter *filter; + IPin *pin1, *pin2, *pin3; + IMediaSeeking *seeking; + IGraphBuilder *graph; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream1, NULL, 0, &mspid1, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream2, NULL, 0, &mspid2, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream3, NULL, 0, &mspid3, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream1, &mspid1, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream2, &mspid2, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream3, &mspid3, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream1, &IID_IPin, (void **)&pin1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream2, &IID_IPin, (void **)&pin2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream3, &IID_IPin, (void **)&pin3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(graph != NULL, "Expected non-NULL graph.\n"); + testfilter_init(&source1); + testfilter_init(&source2); + testfilter_init(&source3); + source1.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + source2.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + source3.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + hr = IGraphBuilder_AddFilter(graph, &source1.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_AddFilter(graph, &source2.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_AddFilter(graph, &source3.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source2.source.pin.IPin_iface, pin2, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_ConnectDirect(graph, &source3.source.pin.IPin_iface, pin3, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source1.source.pin.IPin_iface, pin1, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&seeking); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + source2.is_format_supported_format = GUID_NULL; + hr = IMediaSeeking_IsFormatSupported(seeking, &TIME_FORMAT_MEDIA_TIME); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&source2.is_format_supported_format, &TIME_FORMAT_MEDIA_TIME), + "Got format %s.\n", wine_dbgstr_guid(&source2.is_format_supported_format)); + + source2.is_format_supported_hr = E_FAIL; + source2.is_format_supported_format = GUID_NULL; + hr = IMediaSeeking_IsFormatSupported(seeking, &TIME_FORMAT_MEDIA_TIME); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&source2.is_format_supported_format, &TIME_FORMAT_MEDIA_TIME), + "Got format %s.\n", wine_dbgstr_guid(&source2.is_format_supported_format)); + + source2.is_format_supported_hr = E_NOTIMPL; + source2.is_format_supported_format = GUID_NULL; + hr = IMediaSeeking_IsFormatSupported(seeking, &TIME_FORMAT_MEDIA_TIME); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&source2.is_format_supported_format, &TIME_FORMAT_MEDIA_TIME), + "Got format %s.\n", wine_dbgstr_guid(&source2.is_format_supported_format)); + + source2.IMediaSeeking_iface.lpVtbl = NULL; + hr = IMediaSeeking_IsFormatSupported(seeking, &TIME_FORMAT_MEDIA_TIME); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IGraphBuilder_Disconnect(graph, pin2); + IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); + + hr = IMediaSeeking_IsFormatSupported(seeking, &TIME_FORMAT_MEDIA_TIME); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IGraphBuilder_Disconnect(graph, pin1); + IGraphBuilder_Disconnect(graph, &source1.source.pin.IPin_iface); + IGraphBuilder_Disconnect(graph, pin3); + IGraphBuilder_Disconnect(graph, &source3.source.pin.IPin_iface); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IMediaSeeking_Release(seeking); + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin1); + ref = IAMMediaStream_Release(stream1); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin2); + ref = IAMMediaStream_Release(stream2); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin3); + ref = IAMMediaStream_Release(stream3); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_ddrawstream_getsetdirectdraw(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -8834,6 +8965,7 @@ START_TEST(amstream) test_mediastreamfilter_get_current_stream_time(); test_mediastreamfilter_reference_time_to_stream_time(); test_mediastreamfilter_wait_until(); + test_mediastreamfilter_is_format_supported(); CoUninitialize(); } -- 2.17.1

2 8

[PATCH] winegstreamer: Fixup raw audio caps to be compatible with IMFMediaType.
by Derek Lesho 16 Nov '20

16 Nov '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/media_source.c | 7 +++- dlls/winegstreamer/mfplat.c | 57 +++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 28e424439d8..75fc7dc90a8 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -78,6 +78,7 @@ void start_dispatch_thread(void) DECLSPEC_HIDDEN; extern HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) DECLSPEC_HIDDEN; HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HIDDEN; +GstCaps *make_mf_compatible_caps(GstCaps *caps) DECLSPEC_HIDDEN; IMFMediaType *mf_media_type_from_caps(const GstCaps *caps) DECLSPEC_HIDDEN; GstCaps *caps_from_mf_media_type(IMFMediaType *type) DECLSPEC_HIDDEN; IMFSample *mf_sample_from_gst_buffer(GstBuffer *in) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 828958e47e2..272dbfbfca6 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -869,15 +869,20 @@ fail: static HRESULT media_stream_init_desc(struct media_stream *stream) { - GstCaps *current_caps = gst_pad_get_current_caps(stream->their_src); + GstCaps *base_caps = gst_pad_get_current_caps(stream->their_src); IMFMediaTypeHandler *type_handler; IMFMediaType **stream_types = NULL; IMFMediaType *stream_type = NULL; + GstCaps *current_caps = make_mf_compatible_caps(base_caps); DWORD type_count = 0; const gchar *major_type; unsigned int i; HRESULT hr; + gst_caps_unref(base_caps); + if (!current_caps) + return E_FAIL; + major_type = gst_structure_get_name(gst_caps_get_structure(current_caps, 0)); if (!strcmp(major_type, "video/x-raw")) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 3d224a5accc..7a877c2a416 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -602,6 +602,63 @@ IMFMediaType *mf_media_type_from_caps(const GstCaps *caps) return media_type; } +GstCaps *make_mf_compatible_caps(GstCaps *caps) +{ + GstCaps *ret; + IMFMediaType *media_type; + GstStructure *structure; + const char *mime_type; + + if (gst_caps_get_size(caps) != 1) + return NULL; + + /* Optimization: Don't copy caps if no transformation is needed */ + if ((media_type = mf_media_type_from_caps(caps))) + { + IMFMediaType_Release(media_type); + return gst_caps_ref(caps); + } + + ret = gst_caps_copy(caps); + structure = gst_caps_get_structure(ret, 0); + mime_type = gst_structure_get_name(structure); + + if (!strcmp(mime_type, "audio/x-raw")) + { + const char *format; + if ((format = gst_structure_get_string(structure, "format"))) + { + char type; + unsigned int bits_per_sample; + char endian[2]; + char new_format[6]; + + if (strlen(format) <= 5 && (sscanf(format, "%c%u%2c", &type, &bits_per_sample, endian) >= 2)) + { + if (type == 'U' || type == 'S') + type = bits_per_sample == 8 ? 'U' : 'S'; + + if (endian[0] == 'B') + endian[0] = 'L'; + + sprintf(new_format, "%c%u%.2s", type, bits_per_sample, bits_per_sample > 8 ? endian : 0); + gst_caps_set_simple(caps, "format", G_TYPE_STRING, new_format, NULL); + } + } + } + + if ((media_type = mf_media_type_from_caps(ret))) + IMFMediaType_Release(media_type); + + if (!media_type) + { + gst_caps_unref(ret); + return NULL; + } + + return ret; +} + GstCaps *caps_from_mf_media_type(IMFMediaType *type) { GUID major_type; -- 2.28.0

3 11

[PATCH] winegstreamer: Fix YUV->RGB conversion by copying colorimetry information.
by Akihiro Sagawa 16 Nov '20

16 Nov '20

This patch adds a new GStreamer element called yuvfixup, which copies colorimetry information from its super upstream source to its sink. By using yuvfixup element, the colorimetry informaiton match on videoconvert's sink pad and its source pad. Thus, we can avoid expensive YUV matrix conversions and do YUV->RGB conversion with matrix. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49535 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winegstreamer/Makefile.in | 3 +- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/gstdemux.c | 28 +++- dlls/winegstreamer/main.c | 2 + dlls/winegstreamer/yuvfixup.c | 248 +++++++++++++++++++++++++++++++ 5 files changed, 274 insertions(+), 8 deletions(-) create mode 100644 dlls/winegstreamer/yuvfixup.c

2 3

[PATCH] user32: Avoid holding display_dc_section when creating display DC.
by Paul Gofman 16 Nov '20

16 Nov '20

get_display_dc() may be locking display_dc_section at the end of user driver initialization in LoadCursorA() called from register_builtin_classes(). If the driver initialization initiated in CreateDCW() goes in parallel with the initialization started elsewhere without holding display_dc_section, the process can deadlock. Fixes random lockup on start in Hammerting. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/user32/sysparams.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 1381f387e03..a620116053a 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -548,7 +548,18 @@ static BOOL init_entry_string( struct sysparam_entry *entry, const WCHAR *str ) HDC get_display_dc(void) { EnterCriticalSection( &display_dc_section ); - if (!display_dc) display_dc = CreateDCW( L"DISPLAY", NULL, NULL, NULL ); + if (!display_dc) + { + HDC dc; + + LeaveCriticalSection( &display_dc_section ); + dc = CreateDCW( L"DISPLAY", NULL, NULL, NULL ); + EnterCriticalSection( &display_dc_section ); + if (display_dc) + DeleteDC(dc); + else + display_dc = dc; + } return display_dc; } -- 2.28.0

2 1

[PATCH 1/4] user32/tests: Change misleading variable name and type.
by Jeff Smith 16 Nov '20

16 Nov '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/user32/tests/msg.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index bf20c5c7f20..1e616e3d061 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15964,15 +15964,15 @@ static void test_PostMessage(void) flush_events(); } -static LPARAM g_broadcast_lparam; +static WPARAM g_broadcast_wparam; static LRESULT WINAPI broadcast_test_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); if (wParam == 0xbaadbeef) - g_broadcast_lparam = wParam; + g_broadcast_wparam = wParam; else - g_broadcast_lparam = 0; + g_broadcast_wparam = 0; return CallWindowProcA(oldproc, hwnd, message, wParam, lParam); } @@ -16040,7 +16040,7 @@ static void test_broadcast(void) } /* send, broadcast */ - g_broadcast_lparam = 0xdead; + g_broadcast_wparam = 0xdead; ret = SendMessageTimeoutA(HWND_BROADCAST, messages[i], 0xbaadbeef, 0, SMTO_NORMAL, 2000, NULL); if (!ret && GetLastError() == ERROR_TIMEOUT) win_skip("broadcasting test %d, timeout\n", i); @@ -16048,18 +16048,18 @@ static void test_broadcast(void) { if (messages[i] < WM_USER || messages[i] >= 0xc000) { - ok(g_broadcast_lparam == 0xbaadbeef, "%d: message %04x, got %#lx, error %d\n", i, messages[i], - g_broadcast_lparam, GetLastError()); + ok(g_broadcast_wparam == 0xbaadbeef, "%d: message %04x, got %#lx, error %d\n", i, messages[i], + g_broadcast_wparam, GetLastError()); } else { - ok(g_broadcast_lparam == 0xdead, "%d: message %04x, got %#lx, error %d\n", i, messages[i], - g_broadcast_lparam, GetLastError()); + ok(g_broadcast_wparam == 0xdead, "%d: message %04x, got %#lx, error %d\n", i, messages[i], + g_broadcast_wparam, GetLastError()); } } /* send, topmost */ - g_broadcast_lparam = 0xdead; + g_broadcast_wparam = 0xdead; ret = SendMessageTimeoutA(HWND_TOPMOST, messages[i], 0xbaadbeef, 0, SMTO_NORMAL, 2000, NULL); if (!ret && GetLastError() == ERROR_TIMEOUT) win_skip("broadcasting test %d, timeout\n", i); @@ -16067,13 +16067,13 @@ static void test_broadcast(void) { if (messages[i] < WM_USER || messages[i] >= 0xc000) { - ok(g_broadcast_lparam == 0xbaadbeef, "%d: message %04x, got %#lx, error %d\n", i, messages[i], - g_broadcast_lparam, GetLastError()); + ok(g_broadcast_wparam == 0xbaadbeef, "%d: message %04x, got %#lx, error %d\n", i, messages[i], + g_broadcast_wparam, GetLastError()); } else { - ok(g_broadcast_lparam == 0xdead, "%d: message %04x, got %#lx, error %d\n", i, messages[i], - g_broadcast_lparam, GetLastError()); + ok(g_broadcast_wparam == 0xdead, "%d: message %04x, got %#lx, error %d\n", i, messages[i], + g_broadcast_wparam, GetLastError()); } } } -- 2.23.0

2 7

0001-msvcrt-Adding-I10_OUTPUT-missing-parameters-to-ensur
by dead.ash＠hotmail.com 16 Nov '20

16 Nov '20

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel