March 2014 - Wine-commits - list.winehq.org

Matteo Bruni : d3dx9/tests: Skip a test if DXTn texture formats are not supported.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: d6a919af89d5154e8892f0bcddf961a86fdcc43e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6a919af89d5154e8892f0bcd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 13 16:31:08 2014 +0100 d3dx9/tests: Skip a test if DXTn texture formats are not supported. --- dlls/d3dx9_36/tests/texture.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index aea09d5..1a85d15 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -341,15 +341,22 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) ok(format == expected, "Returned format %u, expected %u\n", format, expected); /* Block-based texture formats and size < block size. */ - format = D3DFMT_DXT1; - width = 2; height = 2; - mipmaps = 1; - hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, &format, D3DPOOL_DEFAULT); - ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); - ok(width == 4, "Returned width %d, expected %d\n", width, 4); - ok(height == 4, "Returned height %d, expected %d\n", height, 4); - ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1); - ok(format == D3DFMT_DXT1, "Returned format %u, expected %u\n", format, D3DFMT_DXT1); + if (has_2d_dxt5) + { + format = D3DFMT_DXT5; + width = 2; height = 2; + mipmaps = 1; + hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(width == 4, "Returned width %d, expected %d\n", width, 4); + ok(height == 4, "Returned height %d, expected %d\n", height, 4); + ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1); + ok(format == D3DFMT_DXT5, "Returned format %u, expected %u\n", format, D3DFMT_DXT5); + } + else + { + skip("D3DFMT_DXT5 textures are not supported, skipping a test.\n"); + } IDirect3D9_Release(d3d); }

1 0

Matteo Bruni : d3dx9/tests: Mark a test todo_wine when DXTn textures aren' t supported by the GL driver.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: 9295ee0c0b47f4b67e7268041008e1d12eff72c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9295ee0c0b47f4b67e7268041… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 13 16:31:09 2014 +0100 d3dx9/tests: Mark a test todo_wine when DXTn textures aren't supported by the GL driver. --- dlls/d3dx9_36/tests/texture.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 1a85d15..16cb0e5 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1637,7 +1637,10 @@ static void test_D3DXCreateVolumeTextureFromFileInMemory(IDirect3DDevice9 *devic ok(hr == D3DERR_INVALIDCALL, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); hr = D3DXCreateVolumeTextureFromFileInMemory(device, dds_volume_map, sizeof(dds_volume_map), &volume_texture); - ok(hr == D3D_OK, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); + if (has_2d_dxt3) + ok(hr == D3D_OK, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); + else + todo_wine ok(hr == D3D_OK, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); if (SUCCEEDED(hr)) { levelcount = IDirect3DVolumeTexture9_GetLevelCount(volume_texture);

1 0

Matteo Bruni : d3dx9: Correctly handle empty parameter data.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: 7617951dfd2e66117d7adbb53f47b5b71e2b84b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7617951dfd2e66117d7adbb53… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 13 16:31:10 2014 +0100 d3dx9: Correctly handle empty parameter data. --- dlls/d3dx9_36/effect.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 260dfa5..9530687 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4332,6 +4332,9 @@ static HRESULT d3dx9_copy_data(struct d3dx_object *object, const char **ptr) read_dword(ptr, &object->size); TRACE("Data size: %#x\n", object->size); + if (!object->size) + return D3D_OK; + object->data = HeapAlloc(GetProcessHeap(), 0, object->size); if (!object->data) {

1 0

Nikolay Sivov : msxml3: Fix some test failures on Win8.1.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: c7d45060e5a246ad79ab848e76387f1f1039b490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d45060e5a246ad79ab848e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 13 21:15:47 2014 +0400 msxml3: Fix some test failures on Win8.1. --- dlls/msxml3/schema.c | 12 ++++++++++-- dlls/msxml3/tests/domdoc.c | 28 +++++++++++++++++----------- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 5bfabb3..2b2882c 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -1292,11 +1292,17 @@ static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection2* iface, BSTR uri TRACE("(%p)->(%s %p)\n", This, debugstr_w(uri), node); - if (This->version == MSXML6) return E_NOTIMPL; + if (This->version == MSXML6) + { + if (node) *node = NULL; + return E_NOTIMPL; + } if (!node) return E_POINTER; + *node = NULL; + name = uri ? xmlchar_from_wchar(uri) : xmlchar_from_wchar(emptyW); entry = (cache_entry*) xmlHashLookup(This->cache, name); heap_free(name); @@ -1305,7 +1311,6 @@ static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection2* iface, BSTR uri if (entry && entry->doc) return get_domdoc_from_xmldoc(entry->doc, (IXMLDOMDocument3**)node); - *node = NULL; return S_OK; } @@ -1344,6 +1349,9 @@ static HRESULT WINAPI schema_cache_get_namespaceURI(IXMLDOMSchemaCollection2* if if (!uri) return E_POINTER; + if (This->version == MSXML6) + *uri = NULL; + if (index >= This->count) return E_FAIL; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 79805cc..dd40133 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10382,7 +10382,8 @@ static void test_dispex(void) hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); - ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); +todo_wine + ok(broken(V_DISPATCH(&ret) == (void*)0x1) || (V_DISPATCH(&ret) == NULL), "got %p\n", V_DISPATCH(&ret)); V_VT(&arg) = VT_I4; V_I4(&arg) = 0; @@ -10396,7 +10397,8 @@ static void test_dispex(void) hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); - ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); +todo_wine + ok(broken(V_DISPATCH(&ret) == (void*)0x1) || (V_DISPATCH(&ret) == NULL), "got %p\n", V_DISPATCH(&ret)); V_VT(&arg) = VT_I4; V_I4(&arg) = 0; @@ -10448,7 +10450,8 @@ static void test_dispex(void) hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); - ok(V_I4(&ret) == 1, "got %d\n", V_I4(&ret)); +todo_wine + ok(broken(V_I4(&ret) == 1) || (V_I4(&ret) == 0), "got %d\n", V_I4(&ret)); IXMLDOMNodeList_Release(node_list); @@ -10473,7 +10476,8 @@ static void test_dispex(void) hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); - ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); +todo_wine + ok(broken(V_DISPATCH(&ret) == (void*)0x1) || (V_DISPATCH(&ret) == NULL), "got %p\n", V_DISPATCH(&ret)); IDispatchEx_Release(dispex); @@ -10547,8 +10551,9 @@ static void test_dispex(void) todo_wine { ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); - ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); } + ok(broken(V_DISPATCH(&ret) == (void*)0x1) || (V_DISPATCH(&ret) == NULL), "got %p\n", V_DISPATCH(&ret)); + V_VT(&arg) = VT_I4; V_I4(&arg) = 0; dispparams.cArgs = 2; @@ -10562,8 +10567,9 @@ todo_wine { todo_wine { ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); - ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); } + ok(broken(V_DISPATCH(&ret) == (void*)0x1) || (V_DISPATCH(&ret) == NULL), "got %p\n", V_DISPATCH(&ret)); + V_VT(&arg) = VT_I4; V_I4(&arg) = 0; dispparams.cArgs = 1; @@ -10614,10 +10620,10 @@ todo_wine V_I4(&ret) = 1; hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr); -todo_wine { +todo_wine ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); - ok(V_I4(&ret) == 1, "got %d\n", V_I4(&ret)); -} + ok(broken(V_I4(&ret) == 1) || (V_I4(&ret) == 0), "got %d\n", V_I4(&ret)); + IXMLDOMNamedNodeMap_Release(map); IXMLDOMElement_Release(elem); @@ -11265,7 +11271,7 @@ static void test_get_namespaces(void) node = (void*)0xdeadbeef; hr = IXMLDOMSchemaCollection_get(collection, _bstr_("http://blah.org"), &node); EXPECT_HR(hr, E_NOTIMPL); - ok(node == (void*)0xdeadbeef, "got %p\n", node); + ok(broken(node == (void*)0xdeadbeef) || (node == NULL), "got %p\n", node); /* load schema and try to add it */ doc2 = create_document(&IID_IXMLDOMDocument2); @@ -11291,7 +11297,7 @@ static void test_get_namespaces(void) s = (void*)0xdeadbeef; hr = IXMLDOMSchemaCollection_get_namespaceURI(collection, 2, &s); EXPECT_HR(hr, E_FAIL); - ok(s == (void*)0xdeadbeef, "got %p\n", s); + ok(broken(s == (void*)0xdeadbeef) || (s == NULL), "got %p\n", s); /* enumerate */ enumv = (void*)0xdeadbeef;

1 0

Jacek Caban : vbscript: Allow empty brackets in argument declarations.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: 69bee9f00452ea526afea75199ba540b391ddee3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69bee9f00452ea526afea7519… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 13 17:44:14 2014 +0100 vbscript: Allow empty brackets in argument declarations. --- dlls/vbscript/parser.y | 6 +++--- dlls/vbscript/tests/lang.vbs | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index cd69f5d..6bd4907 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -434,9 +434,9 @@ ArgumentDeclList | ArgumentDecl ',' ArgumentDeclList { $1->next = $3; $$ = $1; } ArgumentDecl - : Identifier { $$ = new_argument_decl(ctx, $1, TRUE); } - | tBYREF Identifier { $$ = new_argument_decl(ctx, $2, TRUE); } - | tBYVAL Identifier { $$ = new_argument_decl(ctx, $2, FALSE); } + : Identifier EmptyBrackets_opt { $$ = new_argument_decl(ctx, $1, TRUE); } + | tBYREF Identifier EmptyBrackets_opt { $$ = new_argument_decl(ctx, $2, TRUE); } + | tBYVAL Identifier EmptyBrackets_opt { $$ = new_argument_decl(ctx, $2, FALSE); } /* 'property' may be both keyword and identifier, depending on context */ Identifier diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index c1af191..612c615 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1115,4 +1115,21 @@ End Sub Call arrarg(arr, arr, obj.classarr, obj.classarr) +Sub arrarg2(byref refarr(), byval valarr(), byref refarr2(), byval valarr2()) + Call ok(getVT(refarr) = "VT_ARRAY|VT_BYREF|VT_VARIANT*", "getVT(refarr) = " & getVT(refarr)) + Call ok(getVT(valarr) = "VT_ARRAY|VT_VARIANT*", "getVT(valarr) = " & getVT(valarr)) + Call ok(getVT(refarr2) = "VT_ARRAY|VT_VARIANT*", "getVT(refarr2) = " & getVT(refarr2)) + Call ok(getVT(valarr2) = "VT_ARRAY|VT_VARIANT*", "getVT(valarr2) = " & getVT(valarr2)) +End Sub + +Call arrarg2(arr, arr, obj.classarr, obj.classarr) + +Sub testarrarg(arg(), vt) + Call ok(getVT(arg) = vt, "getVT() = " & getVT(arg) & " expected " & vt) +End Sub + +Call testarrarg(1, "VT_I2*") +Call testarrarg(false, "VT_BOOL*") +Call testarrarg(Empty, "VT_EMPTY*") + reportSuccess()

1 0

Dmitry Timoshkov : schedsvc: Add Task Scheduler service.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: 88df368868be59eebee4a5c2b2be7574fb173aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88df368868be59eebee4a5c2b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 7 12:10:28 2014 +0900 schedsvc: Add Task Scheduler service. --- configure | 2 + configure.ac | 1 + dlls/schedsvc/Makefile.in | 8 +++ dlls/schedsvc/schedsvc.c | 158 +++++++++++++++++++++++++++++++++++++++++++ dlls/schedsvc/schedsvc.spec | 1 + dlls/schedsvc/schrpc.idl | 3 + dlls/schedsvc/svc_main.c | 158 +++++++++++++++++++++++++++++++++++++++++++ include/wine/schrpc.idl | 100 +++++++++++++++++++++++++++ loader/wine.inf.in | 16 +++++ 9 files changed, 447 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=88df368868be59eebee4a…

1 0

Dmitry Timoshkov : schedsvc: Implement SchRpcHighestVersion.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: 2463e44f61976bb1f233c36e6c68c91b205e80da URL: http://source.winehq.org/git/wine.git/?a=commit;h=2463e44f61976bb1f233c36e6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 7 12:10:33 2014 +0900 schedsvc: Implement SchRpcHighestVersion. --- dlls/schedsvc/schedsvc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index 9b9d7c5..400ab5d 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -28,8 +28,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(schedsvc); HRESULT __cdecl SchRpcHighestVersion(DWORD *version) { - WINE_FIXME("%p: stub\n", version); - return E_NOTIMPL; + WINE_TRACE("%p\n", version); + + *version = MAKELONG(3, 1); + return S_OK; } HRESULT __cdecl SchRpcRegisterTask(const WCHAR *path, const WCHAR *xml, DWORD flags, const WCHAR *sddl,

1 0

Dmitry Timoshkov : schedsvc: Implement SchRpcCreateFolder.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: 3266b490f72ab231262ed2e37ebaf3e0d65ce1e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3266b490f72ab231262ed2e37… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 7 12:10:37 2014 +0900 schedsvc: Implement SchRpcCreateFolder. --- dlls/schedsvc/schedsvc.c | 84 +++++++++++++++++++++++++++++++++++++- dlls/schedsvc/schedsvc_private.h | 53 ++++++++++++++++++++++++ loader/wine.inf.in | 1 + 3 files changed, 136 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index 400ab5d..def6367 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -24,6 +24,8 @@ #include "schrpc.h" #include "wine/debug.h" +#include "schedsvc_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(schedsvc); HRESULT __cdecl SchRpcHighestVersion(DWORD *version) @@ -34,6 +36,72 @@ HRESULT __cdecl SchRpcHighestVersion(DWORD *version) return S_OK; } +static WCHAR *get_full_name(const WCHAR *path, WCHAR **relative_path) +{ + static const WCHAR tasksW[] = { '\\','t','a','s','k','s','\\',0 }; + WCHAR *target; + int len; + + len = GetSystemDirectoryW(NULL, 0); + len += strlenW(tasksW) + strlenW(path); + + target = heap_alloc(len * sizeof(WCHAR)); + if (target) + { + GetSystemDirectoryW(target, len); + strcatW(target, tasksW); + if (relative_path) + *relative_path = target + strlenW(target) - 1; + while (*path == '\\') path++; + strcatW(target, path); + } + return target; +} + +/* + * Recursively create all directories in the path. + */ +static HRESULT create_directory(const WCHAR *path) +{ + HRESULT hr = S_OK; + WCHAR *new_path; + int len; + + new_path = heap_alloc((strlenW(path) + 1) * sizeof(WCHAR)); + if (!new_path) return E_OUTOFMEMORY; + + strcpyW(new_path, path); + + len = strlenW(new_path); + while (len && new_path[len - 1] == '\\') + { + new_path[len - 1] = 0; + len--; + } + + while (!CreateDirectoryW(new_path, NULL)) + { + WCHAR *slash; + DWORD last_error = GetLastError(); + + if (last_error == ERROR_ALREADY_EXISTS || last_error != ERROR_PATH_NOT_FOUND || + !(slash = strrchrW(new_path, '\\'))) + { + hr = HRESULT_FROM_WIN32(last_error); + break; + } + + len = slash - new_path; + new_path[len] = 0; + hr = create_directory(new_path); + if (hr != S_OK) break; + new_path[len] = '\\'; + } + + heap_free(new_path); + return hr; +} + HRESULT __cdecl SchRpcRegisterTask(const WCHAR *path, const WCHAR *xml, DWORD flags, const WCHAR *sddl, DWORD task_logon_type, DWORD n_creds, const TASK_USER_CRED *creds, WCHAR **actual_path, TASK_XML_ERROR_INFO **xml_error_info) @@ -51,8 +119,20 @@ HRESULT __cdecl SchRpcRetrieveTask(const WCHAR *path, const WCHAR *languages, UL HRESULT __cdecl SchRpcCreateFolder(const WCHAR *path, const WCHAR *sddl, DWORD flags) { - WINE_FIXME("%s,%s,%#x: stub\n", wine_dbgstr_w(path), wine_dbgstr_w(sddl), flags); - return E_NOTIMPL; + WCHAR *full_name; + HRESULT hr; + + WINE_TRACE("%s,%s,%#x\n", wine_dbgstr_w(path), wine_dbgstr_w(sddl), flags); + + if (flags) return E_INVALIDARG; + + full_name = get_full_name(path, NULL); + if (!full_name) return E_OUTOFMEMORY; + + hr = create_directory(full_name); + + heap_free(full_name); + return hr; } HRESULT __cdecl SchRpcSetSecurity(const WCHAR *path, const WCHAR *sddl, DWORD flags) diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h new file mode 100644 index 0000000..082bda5 --- /dev/null +++ b/dlls/schedsvc/schedsvc_private.h @@ -0,0 +1,53 @@ +/* + * Copyright 2014 Dmitry Timoshkov + * + * 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 + */ + +#ifndef __WINE_SCHEDSVC_PRIVATE_H__ +#define __WINE_SCHEDSVC_PRIVATE_H__ + +#include "wine/unicode.h" + +static void *heap_alloc_zero(SIZE_T size) __WINE_ALLOC_SIZE(1); +static inline void *heap_alloc_zero(SIZE_T size) +{ + void *ptr = MIDL_user_allocate(size); + if (ptr) memset(ptr, 0, size); + return ptr; +} + +static void *heap_alloc(SIZE_T size) __WINE_ALLOC_SIZE(1); +static inline void *heap_alloc(SIZE_T size) +{ + return MIDL_user_allocate(size); +} + +static inline void heap_free(void *ptr) +{ + MIDL_user_free(ptr); +} + +static inline WCHAR *heap_strdupW(const WCHAR *src) +{ + WCHAR *dst; + unsigned len; + if (!src) return NULL; + len = (strlenW(src) + 1) * sizeof(WCHAR); + if ((dst = heap_alloc(len))) memcpy(dst, src, len); + return dst; +} + +#endif /* __WINE_SCHEDSVC_PRIVATE_H__ */ diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 7486cfd..d6e6994 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2513,6 +2513,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,logs, 10,temp, 11,mui, +11,tasks, 11,spool\drivers\color, 11,spool\printers, 10,,explorer.exe

1 0

Dmitry Timoshkov : schedsvc: Implement SchRpcDelete.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: b6a3e9be42373bf08894680aa3713a55bb7a674a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a3e9be42373bf08894680aa… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 7 12:10:41 2014 +0900 schedsvc: Implement SchRpcDelete. --- dlls/schedsvc/schedsvc.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index def6367..cc52321 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -197,8 +197,28 @@ HRESULT __cdecl SchRpcRun(const WCHAR *path, DWORD n_args, const WCHAR **args, D HRESULT __cdecl SchRpcDelete(const WCHAR *path, DWORD flags) { - WINE_FIXME("%s,%#x: stub\n", wine_dbgstr_w(path), flags); - return E_NOTIMPL; + WCHAR *full_name; + HRESULT hr = S_OK; + + WINE_TRACE("%s,%#x\n", wine_dbgstr_w(path), flags); + + if (flags) return E_INVALIDARG; + + while (*path == '\\' || *path == '/') path++; + if (!*path) return E_ACCESSDENIED; + + full_name = get_full_name(path, NULL); + if (!full_name) return E_OUTOFMEMORY; + + if (!RemoveDirectoryW(full_name)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + if (hr == HRESULT_FROM_WIN32(ERROR_DIRECTORY)) + hr = DeleteFileW(full_name) ? S_OK : HRESULT_FROM_WIN32(GetLastError()); + } + + heap_free(full_name); + return hr; } HRESULT __cdecl SchRpcRename(const WCHAR *path, const WCHAR *name, DWORD flags)

1 0

Dmitry Timoshkov : schedsvc: Implement SchRpcRegisterTask.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: adab8514e4b7203c0d92e57df2e767dae05d6f79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adab8514e4b7203c0d92e57df… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 7 12:10:45 2014 +0900 schedsvc: Implement SchRpcRegisterTask. --- dlls/schedsvc/schedsvc.c | 107 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 105 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index cc52321..a527ab4 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -22,6 +22,7 @@ #include "windef.h" #include "schrpc.h" +#include "taskschd.h" #include "wine/debug.h" #include "schedsvc_private.h" @@ -102,13 +103,115 @@ static HRESULT create_directory(const WCHAR *path) return hr; } +static HRESULT write_xml_utf8(const WCHAR *name, DWORD disposition, const WCHAR *xmlW) +{ + static const char bom_utf8[] = { 0xef,0xbb,0xbf }; + static const char comment[] = "\n"; + HANDLE hfile; + DWORD size; + char *xml; + HRESULT hr = S_OK; + + hfile = CreateFileW(name, GENERIC_WRITE, 0, NULL, disposition, 0, 0); + if (hfile == INVALID_HANDLE_VALUE) + { + if (GetLastError() == ERROR_FILE_EXISTS) + return HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS); + + return HRESULT_FROM_WIN32(GetLastError()); + } + + size = WideCharToMultiByte(CP_UTF8, 0, xmlW, -1, NULL, 0, NULL, NULL); + xml = heap_alloc(size); + if (!xml) + { + CloseHandle(hfile); + return E_OUTOFMEMORY; + } + WideCharToMultiByte(CP_UTF8, 0, xmlW, -1, xml, size, NULL, NULL); + + if (!WriteFile(hfile, bom_utf8, sizeof(bom_utf8), &size, NULL)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + if (!WriteFile(hfile, comment, strlen(comment), &size, NULL)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + + /* skip XML declaration with UTF-16 specifier */ + if (!memcmp(xml, "<?xml", 5)) + { + const char *p = strchr(xml, '>'); + if (p++) while (isspace(*p)) p++; + else p = xml; + if (!WriteFile(hfile, p, strlen(p), &size, NULL)) + hr = HRESULT_FROM_WIN32(GetLastError()); + } + else + { + if (!WriteFile(hfile, xml, strlen(xml), &size, NULL)) + hr = HRESULT_FROM_WIN32(GetLastError()); + } + +failed: + heap_free(xml); + CloseHandle(hfile); + return hr; +} + HRESULT __cdecl SchRpcRegisterTask(const WCHAR *path, const WCHAR *xml, DWORD flags, const WCHAR *sddl, DWORD task_logon_type, DWORD n_creds, const TASK_USER_CRED *creds, WCHAR **actual_path, TASK_XML_ERROR_INFO **xml_error_info) { - WINE_FIXME("%s,%s,%#x,%s,%u,%u,%p,%p,%p: stub\n", wine_dbgstr_w(path), wine_dbgstr_w(xml), flags, + WCHAR *full_name, *relative_path; + DWORD disposition; + HRESULT hr; + + WINE_TRACE("%s,%s,%#x,%s,%u,%u,%p,%p,%p\n", wine_dbgstr_w(path), wine_dbgstr_w(xml), flags, wine_dbgstr_w(sddl), task_logon_type, n_creds, creds, actual_path, xml_error_info); - return E_NOTIMPL; + + *actual_path = NULL; + *xml_error_info = NULL; + + /* FIXME: assume that validation is performed on the client side */ + if (flags & TASK_VALIDATE_ONLY) return S_OK; + + full_name = get_full_name(path, &relative_path); + if (!full_name) return E_OUTOFMEMORY; + + if (strchrW(path, '\\') || strchrW(path, '/')) + { + WCHAR *p = strrchrW(full_name, '/'); + if (!p) p = strrchrW(full_name, '\\'); + *p = 0; + hr = create_directory(full_name); + *p = '\\'; + } + + switch (flags & (TASK_CREATE | TASK_UPDATE)) + { + default: + case TASK_CREATE: + disposition = CREATE_NEW; + break; + + case TASK_UPDATE: + disposition = OPEN_EXISTING; + break; + + case (TASK_CREATE | TASK_UPDATE): + disposition = OPEN_ALWAYS; + break; + } + + hr = write_xml_utf8(full_name, disposition, xml); + if (hr == S_OK) *actual_path = heap_strdupW(relative_path); + + heap_free(full_name); + return hr; } HRESULT __cdecl SchRpcRetrieveTask(const WCHAR *path, const WCHAR *languages, ULONG *n_languages, WCHAR **xml)

1 0