January 2018 - Wine-Commits

Nikolay Sivov : msxml3/tests: Simplify test error path.
by Alexandre Julliard Jan. 8, 2018

Jan. 8, 2018

Module: wine Branch: master Commit: 3e8acbac874a138829422a955b5700e3a0a01a39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e8acbac874a138829422a95… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 8 17:20:35 2018 +0300 msxml3/tests: Simplify test error path. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/schema.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index ee84b92..48d1c5b 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -666,26 +666,26 @@ static void test_collection_refs(void) LONG length; schema1 = create_document(&IID_IXMLDOMDocument2); - schema2 = create_document(&IID_IXMLDOMDocument2); - schema3 = create_document(&IID_IXMLDOMDocument2); + ok(schema1 != NULL, "Failed to create a document.\n"); cache1 = create_cache(&IID_IXMLDOMSchemaCollection); - cache2 = create_cache(&IID_IXMLDOMSchemaCollection); - cache3 = create_cache(&IID_IXMLDOMSchemaCollection); + ok(cache1 != NULL, "Failed to create schema collection.\n"); - if (!schema1 || !schema2 || !schema3 || !cache1 || !cache2 || !cache3) + if (!schema1 || !cache1) { - if (schema1) IXMLDOMDocument2_Release(schema1); - if (schema2) IXMLDOMDocument2_Release(schema2); - if (schema3) IXMLDOMDocument2_Release(schema3); - - if (cache1) IXMLDOMSchemaCollection_Release(cache1); - if (cache2) IXMLDOMSchemaCollection_Release(cache2); - if (cache3) IXMLDOMSchemaCollection_Release(cache2); - + if (schema1) + IXMLDOMDocument2_Release(schema1); + if (cache1) + IXMLDOMSchemaCollection_Release(cache1); return; } + schema2 = create_document(&IID_IXMLDOMDocument2); + schema3 = create_document(&IID_IXMLDOMDocument2); + + cache2 = create_cache(&IID_IXMLDOMSchemaCollection); + cache3 = create_cache(&IID_IXMLDOMSchemaCollection); + ole_check(IXMLDOMDocument2_loadXML(schema1, _bstr_(xdr_schema1_xml), &b)); ok(b == VARIANT_TRUE, "failed to load XML\n");

1 0

Nikolay Sivov : dwrite/tests: Add missing return value test (Coverity).
by Alexandre Julliard Jan. 8, 2018

Jan. 8, 2018

Module: wine Branch: master Commit: f9e0b6a1e4a6225bfc8e304bc5645289c4d3a336 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9e0b6a1e4a6225bfc8e304b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 8 16:02:52 2018 +0300 dwrite/tests: Add missing return value test (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 7a14180..24e8e73 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -650,7 +650,8 @@ static HRESULT WINAPI resourcecollectionloader_CreateEnumeratorFromKey(IDWriteFo IDWriteFontFile *font_file; HRESULT hr; - IDWriteFactory_CreateCustomFontFileReference(factory, collectionKey, collectionKeySize, This->loader, &font_file); + hr = IDWriteFactory_CreateCustomFontFileReference(factory, collectionKey, collectionKeySize, This->loader, &font_file); + ok(hr == S_OK, "Failed to create custom file reference, hr %#x.\n", hr); hr = create_enumerator(font_file, fontFileEnumerator); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Francois Gouget : kernel32/tests: A couple spelling fixes in a comment.
by Alexandre Julliard Jan. 8, 2018

Jan. 8, 2018

Module: wine Branch: master Commit: 8f35b20a11f8b42b2eeff5ae0faacee2b39bb6cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f35b20a11f8b42b2eeff5ae… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 6 20:36:15 2018 +0100 kernel32/tests: A couple spelling fixes in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index d0d623f..b5c8fc5 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3192,7 +3192,7 @@ static void test_SuspendProcessState(void) 0, NULL); ok(server_pipe_handle != INVALID_HANDLE_VALUE, "Failed to create communication pipe (%d)\n", GetLastError()); - /* Setup the remote process enviornment */ + /* Set up the remote process environment */ ctx.ContextFlags = CONTEXT_FULL; ret = GetThreadContext(pi.hThread, &ctx); ok(ret, "Failed retrieving remote thread context (%d)\n", GetLastError());

1 0

Nikolay Sivov : mshtml/tests: Skip some tests if native XMLHTTP support is missing or disabled.
by Alexandre Julliard Jan. 8, 2018

Jan. 8, 2018

Module: wine Branch: master Commit: 3cb8e4bdc84c3458a0f1979a383266e02ca79d73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cb8e4bdc84c3458a0f1979a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 8 17:00:06 2018 +0300 mshtml/tests: Skip some tests if native XMLHTTP support is missing or disabled. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 7 ++++++- dlls/mshtml/tests/jstest.html | 13 ++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b003467..2a4ae62 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6683,7 +6683,12 @@ static void test_xmlhttprequest(IHTMLWindow5 *window) hres = IHTMLWindow5_get_XMLHttpRequest(window, &var); ok(hres == S_OK, "get_XMLHttpRequest failed: %08x\n", hres); - ok(V_VT(&var) == VT_DISPATCH, "expect VT_DISPATCH, got %s\n", debugstr_variant(&var)); + ok(V_VT(&var) == VT_DISPATCH || broken(V_VT(&var) == VT_EMPTY), "expect VT_DISPATCH, got %s\n", debugstr_variant(&var)); + + if (V_VT(&var) == VT_EMPTY) { + win_skip("Native XMLHTTP support is missing or disabled.\n"); + return; + } factory = NULL; hres = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IHTMLXMLHttpRequestFactory, (void**)&factory); diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index cce8050..164593e 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -1,10 +1,9 @@ <html> <head> +<script src="winetest.js" type="text/javascript"></script> +</head> +<head> <script> -function ok(b,m) { - return external.ok(b, m); -} - function broken(expr) { return external.broken(expr); } @@ -356,7 +355,11 @@ function test_text_node() { function test_xhr() { ok("XMLHttpRequest" in window, "XMLHttpRequest not found in window object\n"); - ok(typeof(XMLHttpRequest) === "object", "typeof(XMLHttpRequest) = " + typeof(XMLHttpRequest)); + + if (typeof(XMLHttpRequest) != "object") { + win_skip("XMLHTTPRequest is not available or disabled"); + return; + } var xhr = new XMLHttpRequest(); ok(typeof(xhr) === "object", "typeof(xhr) = " + typeof(xhr));

1 0

Nikolay Sivov : jscript/tests: Test for script object creation failure ( Coverity).
by Alexandre Julliard Jan. 8, 2018

Jan. 8, 2018

Module: wine Branch: master Commit: 8643a17ff3a9cb6209a76c4170c9b7deede5d020 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8643a17ff3a9cb6209a76c41… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 8 17:57:22 2018 +0300 jscript/tests: Test for script object creation failure (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/run.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index bd5e341..887b264 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2147,6 +2147,8 @@ static HRESULT parse_script_expr(const char *expr, VARIANT *res, IActiveScript * HRESULT hres; engine = create_script(); + if(!engine) + return E_FAIL; hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); @@ -2191,6 +2193,8 @@ static void test_retval(void) HRESULT hres; engine = create_script(); + if(!engine) + return; hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres);

1 0

Jacek Caban : schtasks: Added partial /change command implementation.
by Alexandre Julliard Jan. 8, 2018

Jan. 8, 2018

Module: wine Branch: master Commit: a5af50c5db8e12a5eac3ff0a201238d801f30c5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5af50c5db8e12a5eac3ff0a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 5 23:12:39 2018 +0100 schtasks: Added partial /change command implementation. This is needed by Office 2016 installer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/schtasks/Makefile.in | 1 + programs/schtasks/schtasks.c | 117 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 113 insertions(+), 5 deletions(-) diff --git a/programs/schtasks/Makefile.in b/programs/schtasks/Makefile.in index d06bef2..8c3b790 100644 --- a/programs/schtasks/Makefile.in +++ b/programs/schtasks/Makefile.in @@ -1,5 +1,6 @@ MODULE = schtasks.exe APPMODE = -mconsole -municode +IMPORTS = oleaut32 ole32 C_SRCS = \ schtasks.c diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c index a3af346..c620154 100644 --- a/programs/schtasks/schtasks.c +++ b/programs/schtasks/schtasks.c @@ -16,18 +16,125 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include "initguid.h" +#include "taskschd.h" + #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(schtasks); +const WCHAR change_optW[] = {'/','c','h','a','n','g','e',0}; +const WCHAR enable_optW[] = {'/','e','n','a','b','l','e',0}; +const WCHAR tn_optW[] = {'/','t','n',0}; + +static IRegisteredTask *get_registered_task(const WCHAR *name) +{ + IRegisteredTask *registered_task; + ITaskService *service; + ITaskFolder *folder; + VARIANT empty; + BSTR str; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, + &IID_ITaskService, (void**)&service); + if (FAILED(hres)) + return NULL; + + V_VT(&empty) = VT_EMPTY; + hres = ITaskService_Connect(service, empty, empty, empty, empty); + if (FAILED(hres)) { + FIXME("Connect failed: %08x\n", hres); + return NULL; + } + + hres = ITaskService_GetFolder(service, NULL, &folder); + ITaskService_Release(service); + if (FAILED(hres)) { + FIXME("GetFolder failed: %08x\n", hres); + return NULL; + } + + str = SysAllocString(name); + hres = ITaskFolder_GetTask(folder, str, &registered_task); + SysFreeString(str); + ITaskFolder_Release(folder); + if (FAILED(hres)) { + FIXME("GetTask failed: %08x\n", hres); + return NULL; + } + + return registered_task; +} + +static int change_command(int argc, WCHAR *argv[]) +{ + const WCHAR *task_name; + IRegisteredTask *task; + HRESULT hres; + + if (!argc) { + FIXME("Missing /tn option\n"); + return 1; + } + + if (strcmpiW(argv[0], tn_optW)) { + FIXME("Unsupported %s option\n", debugstr_w(argv[0])); + return 0; + } + + if (argc < 2) { + FIXME("Missing /tn value\n"); + return 1; + } + + task_name = argv[1]; + argc -= 2; + argv += 2; + if (!argc) { + FIXME("Missing change options\n"); + return 1; + } + + if (strcmpiW(argv[0], enable_optW) || argc > 1) { + FIXME("Unsupported arguments %s\n", debugstr_w(argv[0])); + return 0; + } + + task = get_registered_task(task_name); + if (!task) + return 1; + + hres = IRegisteredTask_put_Enabled(task, VARIANT_TRUE); + IRegisteredTask_Release(task); + if (FAILED(hres)) { + FIXME("put_Enabled failed: %08x\n", hres); + return 1; + } + + return 0; +} + int wmain(int argc, WCHAR *argv[]) { - int i; + int i, ret = 0; - WINE_FIXME("stub:"); for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); + TRACE(" %s", wine_dbgstr_w(argv[i])); + TRACE("\n"); - return 0; + CoInitialize(NULL); + + if (argc < 2) + FIXME("Print current tasks state\n"); + else if (!strcmpW(argv[1], change_optW)) + ret = change_command(argc - 2, argv + 2); + else + FIXME("Unsupported command %s\n", debugstr_w(argv[1])); + + CoUninitialize(); + return ret; }

1 0

Jacek Caban : schtasks/tests: Added /change command tests.
by Alexandre Julliard Jan. 8, 2018

Jan. 8, 2018

Module: wine Branch: master Commit: 0219ebc5377a439ed8991f1fcdbbf5673dcfa843 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0219ebc5377a439ed8991f1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 5 23:12:48 2018 +0100 schtasks/tests: Added /change command tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + programs/schtasks/tests/Makefile.in | 6 ++ programs/schtasks/tests/schtasks.c | 189 ++++++++++++++++++++++++++++++++++++ 4 files changed, 197 insertions(+) diff --git a/configure b/configure index 424b2e3..399bc3b 100755 --- a/configure +++ b/configure @@ -19154,6 +19154,7 @@ wine_fn_config_program rundll.exe16 enable_win16 install wine_fn_config_program rundll32 enable_rundll32 install wine_fn_config_program sc enable_sc install wine_fn_config_program schtasks enable_schtasks install +wine_fn_config_test programs/schtasks/tests schtasks.exe_test wine_fn_config_program sdbinst enable_sdbinst install wine_fn_config_program secedit enable_secedit install wine_fn_config_program servicemodelreg enable_servicemodelreg install diff --git a/configure.ac b/configure.ac index 62ad8db..9aa3228 100644 --- a/configure.ac +++ b/configure.ac @@ -3793,6 +3793,7 @@ WINE_CONFIG_PROGRAM(rundll.exe16,enable_win16,[install]) WINE_CONFIG_PROGRAM(rundll32,,[install]) WINE_CONFIG_PROGRAM(sc,,[install]) WINE_CONFIG_PROGRAM(schtasks,,[install]) +WINE_CONFIG_TEST(programs/schtasks/tests) WINE_CONFIG_PROGRAM(sdbinst,,[install]) WINE_CONFIG_PROGRAM(secedit,,[install]) WINE_CONFIG_PROGRAM(servicemodelreg,,[install]) diff --git a/programs/schtasks/tests/Makefile.in b/programs/schtasks/tests/Makefile.in new file mode 100644 index 0000000..dcf641c --- /dev/null +++ b/programs/schtasks/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = schtasks.exe +IMPORTS = ole32 + + +C_SRCS = \ + schtasks.c diff --git a/programs/schtasks/tests/schtasks.c b/programs/schtasks/tests/schtasks.c new file mode 100644 index 0000000..b8a9739 --- /dev/null +++ b/programs/schtasks/tests/schtasks.c @@ -0,0 +1,189 @@ +/* + * Copyright 2018 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "initguid.h" +#include "taskschd.h" + +#include "wine/test.h" + +static ITaskService *service; +static ITaskFolder *root; + +static WCHAR *a2w(const char *str) +{ + WCHAR *ret; + int len; + + if(!str) + return NULL; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + + return ret; +} + +#define run_command(a) _run_command(__LINE__,a) +static DWORD _run_command(unsigned line, const char *cmd) +{ + STARTUPINFOA si = {sizeof(STARTUPINFOA)}; + PROCESS_INFORMATION pi; + char command[1024]; + BOOL r; + DWORD ret; + + si.dwFlags = STARTF_USESTDHANDLES; + si.hStdInput = INVALID_HANDLE_VALUE; + si.hStdOutput = INVALID_HANDLE_VALUE; + si.hStdError = INVALID_HANDLE_VALUE; + + strcpy(command, cmd); + r = CreateProcessA(NULL, command, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi); + ok_(__FILE__,line)(r, "CreateProcess failed: %u\n", GetLastError()); + if(!r) return -1; + + ret = WaitForSingleObject(pi.hProcess, 10000); + ok_(__FILE__,line)(ret == WAIT_OBJECT_0, "wait failed\n"); + if (ret == WAIT_TIMEOUT) + TerminateProcess(pi.hProcess, -1); + + r = GetExitCodeProcess(pi.hProcess, &ret); + ok_(__FILE__,line)(r, "GetExitCodeProcess failed: %u\n", GetLastError()); + + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + return ret; +} + +#define register_task(a) _register_task(__LINE__,a) +static void _register_task(unsigned line, const char *task_name_a) +{ + IRegisteredTask *task; + VARIANT empty; + WCHAR *task_name, *xml; + HRESULT hres; + + static const char xml_a[] = + "<?xml version=\"1.0\"?>\n" + "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" + " <RegistrationInfo>\n" + " <Description>\"Task1\"</Description>\n" + " </RegistrationInfo>\n" + " <Settings>\n" + " <Enabled>false</Enabled>\n" + " <Hidden>false</Hidden>\n" + " </Settings>\n" + " <Actions>\n" + " <Exec>\n" + " <Command>\"task1.exe\"</Command>\n" + " </Exec>\n" + " </Actions>\n" + "</Task>\n"; + + V_VT(&empty) = VT_EMPTY; + task_name = a2w(task_name_a); + xml = a2w(xml_a); + + /* make sure it's not registered */ + ITaskFolder_DeleteTask(root, task_name, 0); + + hres = ITaskFolder_RegisterTask(root, task_name, xml, TASK_CREATE, empty, empty, + TASK_LOGON_NONE, empty, &task); + ok_(__FILE__,line)(hres == S_OK, "RegisterTask failed: %08x\n", hres); + HeapFree(GetProcessHeap(), 0, task_name); + HeapFree(GetProcessHeap(), 0, xml); + + IRegisteredTask_Release(task); +} + +#define unregister_task(a) _unregister_task(__LINE__,a) +static void _unregister_task(unsigned line, const char *task_name_a) +{ + WCHAR *task_name; + HRESULT hres; + + task_name = a2w(task_name_a); + + hres = ITaskFolder_DeleteTask(root, task_name, 0); + ok_(__FILE__,line)(hres == S_OK, "DeleteTask failed: %08x\n", hres); + + HeapFree(GetProcessHeap(), 0, task_name); +} + +static BOOL initialize_task_service(void) +{ + VARIANT empty; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, + &IID_ITaskService, (void **)&service); + if(hres != S_OK) { + ok(hres == REGDB_E_CLASSNOTREG, "Could not create task service: %08x\n", hres); + win_skip("Task service not available\n"); + return FALSE; + } + + V_VT(&empty) = VT_EMPTY; + hres = ITaskService_Connect(service, empty, empty, empty, empty); + ok(hres == S_OK, "Connect failed: %08x\n", hres); + + hres = ITaskService_GetFolder(service, NULL, &root); + ok(hres == S_OK, "GetFolder error %08x\n", hres); + return TRUE; +} + +START_TEST(schtasks) +{ + DWORD r; + + CoInitialize(NULL); + if(!initialize_task_service()) { + CoUninitialize(); + return; + } + + r = run_command("schtasks"); + ok(r == 0, "r = %u\n", r); + + register_task("winetest"); + + r = run_command("schtasks /change /tn winetest /enable"); + ok(r == 0, "r = %u\n", r); + + unregister_task("winetest"); + + r = run_command("schtasks /change /tn winetest /enable"); + ok(r == 1, "r = %u\n", r); + + register_task("wine\\test\\winetest"); + + r = run_command("schtasks /change /tn wine\\test\\winetest /enable"); + ok(r == 0, "r = %u\n", r); + + unregister_task("wine\\test\\winetest"); + + r = run_command("schtasks /change /tn wine\\test\\winetest /enable"); + ok(r == 1, "r = %u\n", r); + + ITaskFolder_Release(root); + ITaskService_Release(service); + CoUninitialize(); +}

1 0

Nikolay Sivov : user32/tests: Add some more tests for message data conversion in dialog procedures.
by Alexandre Julliard Jan. 8, 2018

Jan. 8, 2018

Module: wine Branch: master Commit: df88f96da109bbe5671862ec4ec6e7053f3edfb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df88f96da109bbe5671862ec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 8 15:58:19 2018 +0300 user32/tests: Add some more tests for message data conversion in dialog procedures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 80 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 65 insertions(+), 15 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index afc3473..cbe4b2b 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1239,44 +1239,65 @@ static INT_PTR CALLBACK TestControlStyleDlgProc(HWND hdlg, UINT msg, static const WCHAR testtextW[] = {'W','n','d','T','e','x','t',0}; static INT_PTR CALLBACK test_aw_conversion_dlgprocA(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { - if (msg == WM_SETTEXT) + WCHAR *text = (WCHAR *)lparam; + char *textA = (char *)lparam; + + switch (msg) { + case WM_SETTEXT: + case WM_WININICHANGE: + case WM_DEVMODECHANGE: + case CB_DIR: + case LB_DIR: + case LB_ADDFILE: + case EM_REPLACESEL: if (IsWindowUnicode(hdlg)) - { - WCHAR *text = (WCHAR *)lparam; todo_wine ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); - } else - { - char *textA = (char *)lparam; todo_wine ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); - } - } + break; + }; return DefWindowProcW(hdlg, msg, wparam, lparam); } static INT_PTR CALLBACK test_aw_conversion_dlgprocW(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { - if (msg == WM_SETTEXT) + WCHAR *text = (WCHAR *)lparam; + char *textA = (char *)lparam; + + switch (msg) { + case WM_SETTEXT: + case WM_WININICHANGE: + case WM_DEVMODECHANGE: + case CB_DIR: + case LB_DIR: + case LB_ADDFILE: + case EM_REPLACESEL: if (IsWindowUnicode(hdlg)) - { - WCHAR *text = (WCHAR *)lparam; ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); - } else - { - char *textA = (char *)lparam; ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); - } + break; } return DefWindowProcA(hdlg, msg, wparam, lparam); } +static void dlg_test_aw_message(HWND hdlg, UINT msg) +{ + LRESULT ret; + + ret = SendMessageA(hdlg, msg, 0, (LPARAM)"WndText"); + ok(ret == 0, "Unexpected retval %ld.\n", ret); + + ret = SendMessageW(hdlg, msg, 0, (LPARAM)testtextW); + ok(ret == 0, "Unexpected retval %ld.\n", ret); +} + static INT_PTR CALLBACK test_aw_conversion_dlgproc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { ULONG_PTR dlgproc, originalproc; @@ -1290,6 +1311,7 @@ static INT_PTR CALLBACK test_aw_conversion_dlgproc(HWND hdlg, UINT msg, WPARAM w case WM_INITDIALOG: ok(IsWindowUnicode(hdlg), "Expected unicode window.\n"); + /* WM_SETTEXT/WM_GETTEXT */ originalproc = GetWindowLongPtrW(hdlg, DWLP_DLGPROC); ok(originalproc == (ULONG_PTR)test_aw_conversion_dlgproc, "Unexpected dlg proc %#lx.\n", originalproc); @@ -1320,6 +1342,13 @@ static INT_PTR CALLBACK test_aw_conversion_dlgproc(HWND hdlg, UINT msg, WPARAM w todo_wine ok(!lstrcmpW(buffW, testtextW) && len == 0, "Unexpected window text %s, len %d\n", wine_dbgstr_w(buffW), len); + dlg_test_aw_message(hdlg, WM_WININICHANGE); + dlg_test_aw_message(hdlg, WM_DEVMODECHANGE); + dlg_test_aw_message(hdlg, CB_DIR); + dlg_test_aw_message(hdlg, LB_DIR); + dlg_test_aw_message(hdlg, LB_ADDFILE); + dlg_test_aw_message(hdlg, EM_REPLACESEL); + dlgproc = SetWindowLongPtrW(hdlg, DWLP_DLGPROC, (UINT_PTR)test_aw_conversion_dlgprocW); ok(IsWindowUnicode(hdlg), "Expected unicode window.\n"); @@ -1343,6 +1372,13 @@ static INT_PTR CALLBACK test_aw_conversion_dlgproc(HWND hdlg, UINT msg, WPARAM w ok(buffW[0] == 'W' && buffW[1] == 0xffff && len == 0, "Unexpected window text %#x, %#x, len %d\n", buffW[0], buffW[1], len); + dlg_test_aw_message(hdlg, WM_WININICHANGE); + dlg_test_aw_message(hdlg, WM_DEVMODECHANGE); + dlg_test_aw_message(hdlg, CB_DIR); + dlg_test_aw_message(hdlg, LB_DIR); + dlg_test_aw_message(hdlg, LB_ADDFILE); + dlg_test_aw_message(hdlg, EM_REPLACESEL); + SetWindowLongPtrA(hdlg, DWLP_DLGPROC, originalproc); EndDialog(hdlg, -123); return TRUE; @@ -1391,6 +1427,13 @@ static INT_PTR CALLBACK test_aw_conversion_dlgproc2(HWND hdlg, UINT msg, WPARAM ok(buffW[0] == 0 && buffW[1] == 0xffff && len == 0, "Unexpected window text %s, len %d\n", wine_dbgstr_w(buffW), len); + dlg_test_aw_message(hdlg, WM_WININICHANGE); + dlg_test_aw_message(hdlg, WM_DEVMODECHANGE); + dlg_test_aw_message(hdlg, CB_DIR); + dlg_test_aw_message(hdlg, LB_DIR); + dlg_test_aw_message(hdlg, LB_ADDFILE); + dlg_test_aw_message(hdlg, EM_REPLACESEL); + dlgproc = SetWindowLongPtrW(hdlg, DWLP_DLGPROC, (UINT_PTR)test_aw_conversion_dlgprocA); ok(!IsWindowUnicode(hdlg), "Unexpected unicode window.\n"); @@ -1415,6 +1458,13 @@ static INT_PTR CALLBACK test_aw_conversion_dlgproc2(HWND hdlg, UINT msg, WPARAM ok(buffW[0] == 0 && buffW[1] == 0xffff && len == 0, "Unexpected window text %#x, %#x, len %d\n", buffW[0], buffW[1], len); + dlg_test_aw_message(hdlg, WM_WININICHANGE); + dlg_test_aw_message(hdlg, WM_DEVMODECHANGE); + dlg_test_aw_message(hdlg, CB_DIR); + dlg_test_aw_message(hdlg, LB_DIR); + dlg_test_aw_message(hdlg, LB_ADDFILE); + dlg_test_aw_message(hdlg, EM_REPLACESEL); + SetWindowLongPtrA(hdlg, DWLP_DLGPROC, originalproc); EndDialog(hdlg, -123); return TRUE;

1 0

Alex Henrie : msvcrt: Don' t include MSVC 7.0+ miscellaneous functions in SOs for older DLLs.
by Alexandre Julliard Jan. 8, 2018

Jan. 8, 2018

Module: wine Branch: master Commit: 6413d96b6b91db062b32e5fa62a25e6e5ef348a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6413d96b6b91db062b32e5fa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Jan 6 22:05:31 2018 -0700 msvcrt: Don't include MSVC 7.0+ miscellaneous functions in SOs for older DLLs. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except.c | 2 ++ dlls/msvcrt/mbcs.c | 2 ++ dlls/msvcrt/misc.c | 40 ++++++++++++++++++++++++++++++++-------- dlls/msvcrt/process.c | 2 ++ dlls/msvcrt/thread.c | 2 ++ dlls/msvcrt/wcs.c | 4 ++++ 6 files changed, 44 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 18c2f15..8d13e7f 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -321,6 +321,7 @@ void CDECL __security_error_handler(int code, void *data) MSVCRT__exit(3); } +#if _MSVCR_VER>=110 /********************************************************************* * __crtSetUnhandledExceptionFilter (MSVCR110.@) */ @@ -328,6 +329,7 @@ LPTOP_LEVEL_EXCEPTION_FILTER CDECL MSVCR110__crtSetUnhandledExceptionFilter(LPTO { return SetUnhandledExceptionFilter(filter); } +#endif /********************************************************************* * _CreateFrameInfo (MSVCR80.@) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 6e46b84..7ca1906 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -185,6 +185,7 @@ int CDECL MSVCRT____mb_cur_max_func(void) return get_locinfo()->mb_cur_max; } +#if _MSVCR_VER>=80 /********************************************************************* * ___mb_cur_max_l_func (MSVCR80.@) */ @@ -199,6 +200,7 @@ int* CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) return &locinfo->mb_cur_max; } +#endif /********************************************************************* * INTERNAL: _setmbcp_l diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index b9dadac..d784dec 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -426,8 +426,10 @@ int CDECL MSVCRT__resetstkoflw(void) return VirtualProtect(&stack_addr, 1, PAGE_GUARD|PAGE_READWRITE, &oldprot); } +#if _MSVCR_VER>=80 + /********************************************************************* - * _decode_pointer (MSVCR90.@) + * _decode_pointer (MSVCR80.@) */ void * CDECL MSVCRT_decode_pointer(void * ptr) { @@ -435,7 +437,7 @@ void * CDECL MSVCRT_decode_pointer(void * ptr) } /********************************************************************* - * _encode_pointer (MSVCR90.@) + * _encode_pointer (MSVCR80.@) */ void * CDECL MSVCRT_encode_pointer(void * ptr) { @@ -443,7 +445,7 @@ void * CDECL MSVCRT_encode_pointer(void * ptr) } /********************************************************************* - * _encoded_null (MSVCR100.@) + * _encoded_null (MSVCR80.@) */ void * CDECL _encoded_null(void) { @@ -452,8 +454,12 @@ void * CDECL _encoded_null(void) return EncodePointer(NULL); } +#endif /* _MSVCR_VER>=80 */ + +#if _MSVCR_VER>=70 + /********************************************************************* - * _CRT_RTC_INIT (MSVCR100.@) + * _CRT_RTC_INIT (MSVCR70.@) */ void* CDECL _CRT_RTC_INIT(void *unk1, void *unk2, int unk3, int unk4, int unk5) { @@ -462,7 +468,7 @@ void* CDECL _CRT_RTC_INIT(void *unk1, void *unk2, int unk3, int unk4, int unk5) } /********************************************************************* - * _CRT_RTC_INITW (MSVCR100.@) + * _CRT_RTC_INITW (MSVCR70.@) */ void* CDECL _CRT_RTC_INITW(void *unk1, void *unk2, int unk3, int unk4, int unk5) { @@ -470,8 +476,12 @@ void* CDECL _CRT_RTC_INITW(void *unk1, void *unk2, int unk3, int unk4, int unk5) return NULL; } +#endif /* _MSVCR_VER>=70 */ + +#if _MSVCR_VER>=80 + /********************************************************************* - * _byteswap_ushort (MSVCR100.@) + * _byteswap_ushort (MSVCR80.@) */ unsigned short CDECL _byteswap_ushort(unsigned short s) { @@ -479,7 +489,7 @@ unsigned short CDECL _byteswap_ushort(unsigned short s) } /********************************************************************* - * _byteswap_ulong (MSVCR100.@) + * _byteswap_ulong (MSVCR80.@) */ ULONG CDECL MSVCRT__byteswap_ulong(ULONG l) { @@ -487,7 +497,7 @@ ULONG CDECL MSVCRT__byteswap_ulong(ULONG l) } /********************************************************************* - * _byteswap_uint64 (MSVCR100.@) + * _byteswap_uint64 (MSVCR80.@) */ unsigned __int64 CDECL _byteswap_uint64(unsigned __int64 i) { @@ -495,6 +505,10 @@ unsigned __int64 CDECL _byteswap_uint64(unsigned __int64 i) ((i>>8)&0xFF000000) + ((i>>24)&0xFF0000) + ((i>>40)&0xFF00) + (i>>56); } +#endif /* _MSVCR_VER>=80 */ + +#if _MSVCR_VER>=110 + /********************************************************************* * __crtGetShowWindowMode (MSVCR110.@) */ @@ -517,6 +531,9 @@ BOOL CDECL MSVCR110__crtInitializeCriticalSectionEx( return InitializeCriticalSectionEx(cs, spin_count, flags); } +#endif /* _MSVCR_VER>=110 */ + +#if _MSVCR_VER>=120 /********************************************************************* * _vacopy (MSVCR120.@) */ @@ -524,7 +541,9 @@ void CDECL MSVCR120__vacopy(__ms_va_list *dest, __ms_va_list src) { __ms_va_copy(*dest, src); } +#endif +#if _MSVCR_VER>=80 /********************************************************************* * _crt_debugger_hook (MSVCR80.@) */ @@ -532,7 +551,9 @@ void CDECL MSVCRT__crt_debugger_hook(int reserved) { WARN("(%x)\n", reserved); } +#endif +#if _MSVCR_VER>=110 /********************************************************************* * __crtUnhandledException (MSVCR110.@) */ @@ -542,7 +563,9 @@ LONG CDECL MSVCRT__crtUnhandledException(EXCEPTION_POINTERS *ep) SetUnhandledExceptionFilter(NULL); return UnhandledExceptionFilter(ep); } +#endif +#if _MSVCR_VER>=120 /********************************************************************* * __crtSleep (MSVCR120.@) */ @@ -551,3 +574,4 @@ void CDECL MSVCRT__crtSleep(DWORD timeout) TRACE("(%u)\n", timeout); Sleep(timeout); } +#endif diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index 1a183bc..fac3bd4 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -1325,6 +1325,7 @@ int CDECL _getpid(void) return GetCurrentProcessId(); } +#if _MSVCR_VER>=110 /********************************************************************* * __crtTerminateProcess (MSVCR110.@) */ @@ -1332,3 +1333,4 @@ int CDECL MSVCR110__crtTerminateProcess(UINT exit_code) { return TerminateProcess(GetCurrentProcess(), exit_code); } +#endif diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index da1f8bf..af31534 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -164,6 +164,7 @@ MSVCRT_uintptr_t CDECL _beginthreadex( initflag, thrdaddr); } +#if _MSVCR_VER>=80 /********************************************************************* * _getptd (MSVCR80.@) */ @@ -172,3 +173,4 @@ thread_data_t* CDECL _getptd(void) FIXME("returns undocumented/not fully filled data\n"); return msvcrt_get_thread_data(); } +#endif diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 1aa8d98..098e0d5 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -40,6 +40,8 @@ static BOOL n_format_enabled = TRUE; #include "printf.h" #undef PRINTF_WIDE +#if _MSVCR_VER>=80 + /********************************************************************* * _get_printf_count_output (MSVCR80.@) */ @@ -58,6 +60,8 @@ int CDECL MSVCRT__set_printf_count_output( int enable ) return old ? 1 : 0; } +#endif /* _MSVCR_VER>=80 */ + /********************************************************************* * _wcsdup (MSVCRT.@) */

1 0

Andrey Gusev : msctf/tests: Fix a typo in sink_check_ok().
by Alexandre Julliard Jan. 8, 2018

Jan. 8, 2018

Module: wine Branch: master Commit: 0b7882b00b71a95a255a1593643c5a42f0a29aa6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b7882b00b71a95a255a1593… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jan 8 13:45:27 2018 +0200 msctf/tests: Fix a typo in sink_check_ok(). Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 34a2709..9bd112c 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1901,7 +1901,7 @@ TfEditCookie ec) ok(SUCCEEDED(hr),"ITfContext_GetSelection failed\n"); ok(fetched == 1,"fetched incorrect\n"); ok(selection.range != NULL,"NULL range\n"); - sink_check_ok(&test_ACP_GetSelection,"ACP_GetSepection"); + sink_check_ok(&test_ACP_GetSelection,"GetSelection"); ITfRange_Release(selection.range); test_InsertAtSelection(ec, cxt);

1 0