January 2014 - Wine-commits

Piotr Caban : msvcm90: Share the source code with msvcm80.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 0e658d111c41da4188f393fd2a1b06b25de6a7d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e658d111c41da4188f393fd2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 28 10:10:01 2014 +0100 msvcm90: Share the source code with msvcm80. --- dlls/msvcm80/Makefile.in | 2 +- dlls/msvcm80/{msvcm80_main.c => msvcm_main.c} | 0 dlls/msvcm90/Makefile.in | 3 +- dlls/msvcm90/msvcm90_main.c | 43 ------------------------- 4 files changed, 3 insertions(+), 45 deletions(-) diff --git a/dlls/msvcm80/Makefile.in b/dlls/msvcm80/Makefile.in index bbef214..c3bf20e 100644 --- a/dlls/msvcm80/Makefile.in +++ b/dlls/msvcm80/Makefile.in @@ -1,4 +1,4 @@ MODULE = msvcm80.dll C_SRCS = \ - msvcm80_main.c + msvcm_main.c diff --git a/dlls/msvcm80/msvcm80_main.c b/dlls/msvcm80/msvcm_main.c similarity index 100% rename from dlls/msvcm80/msvcm80_main.c rename to dlls/msvcm80/msvcm_main.c diff --git a/dlls/msvcm90/Makefile.in b/dlls/msvcm90/Makefile.in index a543df3..6b03a53 100644 --- a/dlls/msvcm90/Makefile.in +++ b/dlls/msvcm90/Makefile.in @@ -1,4 +1,5 @@ MODULE = msvcm90.dll +PARENTSRC = ../msvcm80 C_SRCS = \ - msvcm90_main.c + msvcm_main.c diff --git a/dlls/msvcm90/msvcm90_main.c b/dlls/msvcm90/msvcm90_main.c deleted file mode 100644 index 6019afd..0000000 --- a/dlls/msvcm90/msvcm90_main.c +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2012 Vincent Povirk 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 - */ - -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msvcm90); - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -}

1 0

Dmitry Timoshkov : taskschd: Add some invalid parameters checks to ITaskFolder::DeleteFolder.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: e654be2aeca93fb7c0da9079e7c58b718f2270ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=e654be2aeca93fb7c0da9079e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:54:24 2014 +0900 taskschd: Add some invalid parameters checks to ITaskFolder::DeleteFolder. --- dlls/taskschd/folder.c | 2 ++ dlls/taskschd/tests/scheduler.c | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 4eb7b8a..412ec5b 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -270,6 +270,8 @@ static HRESULT WINAPI TaskFolder_DeleteFolder(ITaskFolder *iface, BSTR name, LON TRACE("%p,%s,%x\n", iface, debugstr_w(name), flags); + if (!name || !*name) return E_ACCESSDENIED; + if (flags) FIXME("unsupported flags %x\n", flags); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 61e4a04..2d9beea 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -346,6 +346,16 @@ todo_wine hr = ITaskFolder_DeleteFolder(folder, Wine, 0); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); + hr = ITaskFolder_DeleteFolder(folder, NULL, 0); + ok(hr == E_ACCESSDENIED || hr == E_INVALIDARG /* Vista */, "expected E_ACCESSDENIED, got %#x\n", hr); + + hr = ITaskFolder_DeleteFolder(folder, empty, 0); + ok(hr == E_ACCESSDENIED || hr == E_INVALIDARG /* Vista */, "expected E_ACCESSDENIED, got %#x\n", hr); + + hr = ITaskFolder_DeleteFolder(folder, slash, 0); +todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); + ITaskFolder_Release(folder); ITaskService_Release(service); }

1 0

Dmitry Timoshkov : taskschd: Add ITaskFolderCollection stub implementation.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 553352f0afd3db0fd77c10aa98e322d0ee63e60e URL: http://source.winehq.org/git/wine.git/?a=commit;h=553352f0afd3db0fd77c10aa9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:54:29 2014 +0900 taskschd: Add ITaskFolderCollection stub implementation. --- dlls/taskschd/Makefile.in | 1 + dlls/taskschd/folder.c | 10 ++- dlls/taskschd/folder_collection.c | 157 +++++++++++++++++++++++++++++++++++++ dlls/taskschd/taskschd_private.h | 1 + 4 files changed, 167 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/Makefile.in b/dlls/taskschd/Makefile.in index fa4beba..70a50a0 100644 --- a/dlls/taskschd/Makefile.in +++ b/dlls/taskschd/Makefile.in @@ -3,6 +3,7 @@ IMPORTS = advapi32 oleaut32 C_SRCS = \ folder.c \ + folder_collection.c \ task.c \ taskschd.c diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 412ec5b..ce0176a 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -232,8 +232,14 @@ static HRESULT WINAPI TaskFolder_GetFolder(ITaskFolder *iface, BSTR path, ITaskF static HRESULT WINAPI TaskFolder_GetFolders(ITaskFolder *iface, LONG flags, ITaskFolderCollection **folders) { - FIXME("%p,%x,%p: stub\n", iface, flags, folders); - return E_NOTIMPL; + TaskFolder *folder = impl_from_ITaskFolder(iface); + + TRACE("%p,%x,%p: stub\n", iface, flags, folders); + + if (flags) + FIXME("unsupported flags %x\n", flags); + + return TaskFolderCollection_create(folder->path, folders); } static inline BOOL is_variant_null(const VARIANT *var) diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c new file mode 100644 index 0000000..3327511 --- /dev/null +++ b/dlls/taskschd/folder_collection.c @@ -0,0 +1,157 @@ +/* + * 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 + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "taskschd.h" +#include "taskschd_private.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(taskschd); + +typedef struct +{ + ITaskFolderCollection ITaskFolderCollection_iface; + LONG ref; +} TaskFolderCollection; + +static inline TaskFolderCollection *impl_from_ITaskFolderCollection(ITaskFolderCollection *iface) +{ + return CONTAINING_RECORD(iface, TaskFolderCollection, ITaskFolderCollection_iface); +} + +static ULONG WINAPI folders_AddRef(ITaskFolderCollection *iface) +{ + TaskFolderCollection *folders = impl_from_ITaskFolderCollection(iface); + return InterlockedIncrement(&folders->ref); +} + +static ULONG WINAPI folders_Release(ITaskFolderCollection *iface) +{ + TaskFolderCollection *folders = impl_from_ITaskFolderCollection(iface); + LONG ref = InterlockedDecrement(&folders->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + HeapFree(GetProcessHeap(), 0, folders); + } + + return ref; +} + +static HRESULT WINAPI folders_QueryInterface(ITaskFolderCollection *iface, REFIID riid, void **obj) +{ + if (!riid || !obj) return E_INVALIDARG; + + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_ITaskFolderCollection) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + ITaskFolderCollection_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static HRESULT WINAPI folders_GetTypeInfoCount(ITaskFolderCollection *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI folders_GetTypeInfo(ITaskFolderCollection *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI folders_GetIDsOfNames(ITaskFolderCollection *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + return E_NOTIMPL; +} + +static HRESULT WINAPI folders_Invoke(ITaskFolderCollection *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + params, result, excepinfo, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI folders_get_Count(ITaskFolderCollection *iface, LONG *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI folders_get_Item(ITaskFolderCollection *iface, VARIANT index, ITaskFolder **folder) +{ + FIXME("%p,%s,%p: stub\n", iface, debugstr_variant(&index), folder); + return E_NOTIMPL; +} + +static HRESULT WINAPI folders_get__NewEnum(ITaskFolderCollection *iface, IUnknown **penum) +{ + FIXME("%p,%p: stub\n", iface, penum); + return E_NOTIMPL; +} + +static const ITaskFolderCollectionVtbl TaskFolderCollection_vtbl = +{ + folders_QueryInterface, + folders_AddRef, + folders_Release, + folders_GetTypeInfoCount, + folders_GetTypeInfo, + folders_GetIDsOfNames, + folders_Invoke, + folders_get_Count, + folders_get_Item, + folders_get__NewEnum +}; + +HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **obj) +{ + TaskFolderCollection *folders; + + folders = HeapAlloc(GetProcessHeap(), 0, sizeof(*folders)); + if (!folders) return E_OUTOFMEMORY; + + folders->ITaskFolderCollection_iface.lpVtbl = &TaskFolderCollection_vtbl; + folders->ref = 1; + *obj = &folders->ITaskFolderCollection_iface; + + TRACE("created %p\n", *obj); + + return S_OK; +} diff --git a/dlls/taskschd/taskschd_private.h b/dlls/taskschd/taskschd_private.h index 4ef348f..0d801a9 100644 --- a/dlls/taskschd/taskschd_private.h +++ b/dlls/taskschd/taskschd_private.h @@ -18,5 +18,6 @@ HRESULT TaskService_create(void **obj) DECLSPEC_HIDDEN; HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj, BOOL create) DECLSPEC_HIDDEN; +HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **obj) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT *v) DECLSPEC_HIDDEN;

1 0

Dmitry Timoshkov : taskschd/tests: Add some ITaskFolderCollection tests.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 463b1b645097c198ba1f7714e20cc362c1cd065f URL: http://source.winehq.org/git/wine.git/?a=commit;h=463b1b645097c198ba1f7714e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:54:33 2014 +0900 taskschd/tests: Add some ITaskFolderCollection tests. --- dlls/taskschd/tests/scheduler.c | 249 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 249 insertions(+) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 2d9beea..700fab2 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -360,12 +361,260 @@ todo_wine ITaskService_Release(service); } +static void set_var(int vt, VARIANT *var, LONG val) +{ + V_VT(var) = vt; + + switch(vt) + { + case VT_I1: + case VT_UI1: + V_UI1(var) = (BYTE)val; + break; + + case VT_I2: + case VT_UI2: + V_UI2(var) = (USHORT)val; + break; + + case VT_I4: + case VT_UI4: + V_UI4(var) = val; + break; + + case VT_I8: + case VT_UI8: + V_UI8(var) = val; + break; + + case VT_INT: + case VT_UINT: + V_UINT(var) = val; + break; + + default: + assert(0); + break; + } +} + +static void test_FolderCollection(void) +{ + static WCHAR Wine[] = { '\\','W','i','n','e',0 }; + static WCHAR Wine_Folder1[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','1',0 }; + static WCHAR Wine_Folder2[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','2',0 }; + static WCHAR Wine_Folder3[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','3',0 }; + static const WCHAR Folder1[] = { 'F','o','l','d','e','r','1',0 }; + static const WCHAR Folder2[] = { 'F','o','l','d','e','r','2',0 }; + HRESULT hr; + BSTR bstr; + VARIANT v_null, var[3]; + ITaskService *service; + ITaskFolder *root, *folder, *subfolder; + ITaskFolderCollection *folders; + IUnknown *unknown; + IEnumVARIANT *enumvar; + LONG count, i; + VARIANT idx; + static const int vt[] = { VT_I1, VT_I2, VT_I4, VT_I8, VT_UI1, VT_UI2, VT_UI4, VT_UI8, VT_INT, VT_UINT }; + + hr = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskService, (void **)&service); + if (hr != S_OK) + { + win_skip("CoCreateInstance(CLSID_TaskScheduler) error %#x\n", hr); + return; + } + + V_VT(&v_null) = VT_NULL; + + hr = ITaskService_Connect(service, v_null, v_null, v_null, v_null); + ok(hr == S_OK, "Connect error %#x\n", hr); + + hr = ITaskService_GetFolder(service, NULL, &root); + ok(hr == S_OK, "GetFolder error %#x\n", hr); + + /* Just in case something was left from previous runs */ + ITaskFolder_DeleteFolder(root, Wine_Folder1, 0); + ITaskFolder_DeleteFolder(root, Wine_Folder2, 0); + ITaskFolder_DeleteFolder(root, Wine_Folder3, 0); + ITaskFolder_DeleteFolder(root, Wine, 0); + + hr = ITaskFolder_CreateFolder(root, Wine_Folder1, v_null, &subfolder); + ok(hr == S_OK, "CreateFolder error %#x\n", hr); + ITaskFolder_Release(subfolder); + + hr = ITaskFolder_CreateFolder(root, Wine_Folder2, v_null, &subfolder); + ok(hr == S_OK, "CreateFolder error %#x\n", hr); + ITaskFolder_Release(subfolder); + + hr = ITaskFolder_GetFolder(root, Wine, &folder); + ok(hr == S_OK, "GetFolder error %#x\n", hr); + + hr = ITaskFolder_GetFolders(folder, 0, &folders); + ok(hr == S_OK, "GetFolders error %#x\n", hr); + + ITaskFolder_Release(folder); + + count = 0; + hr = ITaskFolderCollection_get_Count(folders, &count); +todo_wine + ok(hr == S_OK, "get_Count error %#x\n", hr); +todo_wine + ok(count == 2, "expected 2, got %d\n", count); + + hr = ITaskFolder_CreateFolder(root, Wine_Folder3, v_null, &subfolder); + ok(hr == S_OK, "CreateFolder error %#x\n", hr); + ITaskFolder_Release(subfolder); + + count = 0; + hr = ITaskFolderCollection_get_Count(folders, &count); +todo_wine + ok(hr == S_OK, "get_Count error %#x\n", hr); +todo_wine + ok(count == 2, "expected 2, got %d\n", count); + /* FIXME: remove once implemented */ + if (!count) goto failed; + + for (i = 0; i < sizeof(vt)/sizeof(vt[0]); i++) + { + set_var(vt[i], &idx, 1); + hr = ITaskFolderCollection_get_Item(folders, idx, &subfolder); + ok(hr == S_OK, "get_Item(vt = %d) error %#x\n", vt[i], hr); + ITaskFolder_Release(subfolder); + } + + for (i = 0; i <= count; i++) + { + V_VT(&idx) = VT_I4; + V_UI4(&idx) = i; + hr = ITaskFolderCollection_get_Item(folders, idx, &subfolder); + if (i == 0) + { + ok (hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + continue; + } + ok(hr == S_OK, "get_Item error %#x\n", hr); + + hr = ITaskFolder_get_Path(subfolder, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + if (i == 1) + ok(!lstrcmpW(bstr, Wine_Folder1), "expected \\Wine\\Folder1, got %s\n", wine_dbgstr_w(bstr)); + else + ok(!lstrcmpW(bstr, Wine_Folder2), "expected \\Wine\\Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + hr = ITaskFolder_get_Name(subfolder, &bstr); + ok(hr == S_OK, "get_Name error %#x\n", hr); + if (i == 1) + ok(!lstrcmpW(bstr, Folder1), "expected Folder1, got %s\n", wine_dbgstr_w(bstr)); + else + ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); + + ITaskFolder_Release(subfolder); + + V_VT(&idx) = VT_BSTR; + V_BSTR(&idx) = bstr; + hr = ITaskFolderCollection_get_Item(folders, idx, &subfolder); + ok(hr == S_OK, "get_Item error %#x\n", hr); + SysFreeString(bstr); + + hr = ITaskFolder_get_Path(subfolder, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + if (i == 1) + ok(!lstrcmpW(bstr, Wine_Folder1), "expected \\Wine\\Folder1, got %s\n", wine_dbgstr_w(bstr)); + else + ok(!lstrcmpW(bstr, Wine_Folder2), "expected \\Wine\\Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + hr = ITaskFolder_get_Name(subfolder, &bstr); + ok(hr == S_OK, "get_Name error %#x\n", hr); + if (i == 1) + ok(!lstrcmpW(bstr, Folder1), "expected Folder1, got %s\n", wine_dbgstr_w(bstr)); + else + ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); + + ITaskFolder_Release(subfolder); + } + + V_VT(&idx) = VT_I4; + V_UI4(&idx) = 3; + hr = ITaskFolderCollection_get_Item(folders, idx, &subfolder); + ok (hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = ITaskFolderCollection_QueryInterface(folders, &IID_IEnumVARIANT, (void **)&enumvar); + ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); + hr = ITaskFolderCollection_QueryInterface(folders, &IID_IEnumUnknown, (void **)&enumvar); + ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); + + hr = ITaskFolderCollection_get__NewEnum(folders, &unknown); + ok(hr == S_OK, "get__NewEnum error %#x\n", hr); + hr = IUnknown_QueryInterface(unknown, &IID_IEnumUnknown, (void **)&enumvar); + ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); + hr = IUnknown_QueryInterface(unknown, &IID_IEnumVARIANT, (void **)&enumvar); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + IEnumVARIANT_Release(enumvar); + + hr = IUnknown_QueryInterface(unknown, &IID_IUnknown, (void **)&enumvar); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + memset(var, 0, sizeof(var)); + count = 0; + hr = IEnumVARIANT_Next(enumvar, 3, var, (ULONG *)&count); + ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); + ok(count == 2, "expected 2, got %d\n", count); + ok(V_VT(&var[0]) == VT_DISPATCH, "expected VT_DISPATCH, got %d\n", V_VT(&var[0])); + ok(V_VT(&var[1]) == VT_DISPATCH, "expected VT_DISPATCH, got %d\n", V_VT(&var[1])); + IEnumVARIANT_Release(enumvar); + + for (i = 0; i < count; i++) + { + hr = IDispatch_QueryInterface(V_DISPATCH(&var[i]), &IID_ITaskFolder, (void **)&subfolder); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + hr = ITaskFolder_get_Path(subfolder, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + if (i == 0) + ok(!lstrcmpW(bstr, Wine_Folder1), "expected \\Wine\\Folder1, got %s\n", wine_dbgstr_w(bstr)); + else + ok(!lstrcmpW(bstr, Wine_Folder2), "expected \\Wine\\Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + hr = ITaskFolder_get_Name(subfolder, &bstr); + ok(hr == S_OK, "get_Name error %#x\n", hr); + if (i == 0) + ok(!lstrcmpW(bstr, Folder1), "expected Folder1, got %s\n", wine_dbgstr_w(bstr)); + else + ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); + + ITaskFolder_Release(subfolder); + } + + IDispatch_Release(V_DISPATCH(&var[0])); + IDispatch_Release(V_DISPATCH(&var[1])); + +failed: + ITaskFolderCollection_Release(folders); + + hr = ITaskFolder_DeleteFolder(root, Wine_Folder1, 0); + ok(hr == S_OK, "DeleteFolder error %#x\n", hr); + hr = ITaskFolder_DeleteFolder(root, Wine_Folder2, 0); + ok(hr == S_OK, "DeleteFolder error %#x\n", hr); + hr = ITaskFolder_DeleteFolder(root, Wine_Folder3, 0); + ok(hr == S_OK, "DeleteFolder error %#x\n", hr); + hr = ITaskFolder_DeleteFolder(root, Wine, 0); + ok(hr == S_OK, "DeleteFolder error %#x\n", hr); + + ITaskFolder_Release(root); + ITaskService_Release(service); +} + START_TEST(scheduler) { OleInitialize(NULL); test_Connect(); test_GetFolder(); + test_FolderCollection(); OleUninitialize(); }

1 0

Dmitry Timoshkov : taskschd: Add some useful inline helpers for memory management.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 89548cd0ad2b5fbca1297fa48e2005aacb28add6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89548cd0ad2b5fbca1297fa48… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:54:36 2014 +0900 taskschd: Add some useful inline helpers for memory management. --- dlls/taskschd/folder.c | 12 ++++++------ dlls/taskschd/folder_collection.c | 4 ++-- dlls/taskschd/task.c | 4 ++-- dlls/taskschd/taskschd_private.h | 29 +++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 10 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index ce0176a..1793a62 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -60,8 +60,8 @@ static ULONG WINAPI TaskFolder_Release(ITaskFolder *iface) if (!ref) { TRACE("destroying %p\n", iface); - HeapFree(GetProcessHeap(), 0, folder->path); - HeapFree(GetProcessHeap(), 0, folder); + heap_free(folder->path); + heap_free(folder); } return ref; @@ -374,7 +374,7 @@ HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder ** if (parent) len += strlenW(parent); /* +1 if parent is not '\' terminated */ - folder_path = HeapAlloc(GetProcessHeap(), 0, (len + 2) * sizeof(WCHAR)); + folder_path = heap_alloc((len + 2) * sizeof(WCHAR)); if (!folder_path) return E_OUTOFMEMORY; folder_path[0] = 0; @@ -399,16 +399,16 @@ HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder ** hr = create ? reg_create_folder(folder_path, &hfolder) : reg_open_folder(folder_path, &hfolder); if (hr) { - HeapFree(GetProcessHeap(), 0, folder_path); + heap_free(folder_path); return hr; } reg_close_folder(hfolder); - folder = HeapAlloc(GetProcessHeap(), 0, sizeof(*folder)); + folder = heap_alloc(sizeof(*folder)); if (!folder) { - HeapFree(GetProcessHeap(), 0, folder_path); + heap_free(folder_path); return E_OUTOFMEMORY; } diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index 3327511..4448667 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -56,7 +56,7 @@ static ULONG WINAPI folders_Release(ITaskFolderCollection *iface) if (!ref) { TRACE("destroying %p\n", iface); - HeapFree(GetProcessHeap(), 0, folders); + heap_free(folders); } return ref; @@ -144,7 +144,7 @@ HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **o { TaskFolderCollection *folders; - folders = HeapAlloc(GetProcessHeap(), 0, sizeof(*folders)); + folders = heap_alloc(sizeof(*folders)); if (!folders) return E_OUTOFMEMORY; folders->ITaskFolderCollection_iface.lpVtbl = &TaskFolderCollection_vtbl; diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index a13a968..c424700 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -59,7 +59,7 @@ static ULONG WINAPI TaskService_Release(ITaskService *iface) if (!ref) { TRACE("destroying %p\n", iface); - HeapFree(GetProcessHeap(), 0, task_svc); + heap_free(task_svc); } return ref; @@ -254,7 +254,7 @@ HRESULT TaskService_create(void **obj) { TaskService *task_svc; - task_svc = HeapAlloc(GetProcessHeap(), 0, sizeof(*task_svc)); + task_svc = heap_alloc(sizeof(*task_svc)); if (!task_svc) return E_OUTOFMEMORY; task_svc->ITaskService_iface.lpVtbl = &TaskService_vtbl; diff --git a/dlls/taskschd/taskschd_private.h b/dlls/taskschd/taskschd_private.h index 0d801a9..9837cd3 100644 --- a/dlls/taskschd/taskschd_private.h +++ b/dlls/taskschd/taskschd_private.h @@ -16,8 +16,37 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/unicode.h" + HRESULT TaskService_create(void **obj) DECLSPEC_HIDDEN; HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj, BOOL create) DECLSPEC_HIDDEN; HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **obj) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT *v) DECLSPEC_HIDDEN; + +static void *heap_alloc(SIZE_T size) __WINE_ALLOC_SIZE(1); +static inline void *heap_alloc(SIZE_T size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +static void *heap_realloc(void *ptr, SIZE_T size) __WINE_ALLOC_SIZE(2); +static inline void *heap_realloc(void *ptr, SIZE_T size) +{ + return HeapReAlloc(GetProcessHeap(), 0, ptr, size); +} + +static inline BOOL heap_free(void *ptr) +{ + return HeapFree(GetProcessHeap(), 0, 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; +}

1 0

Dmitry Timoshkov : taskschd: Implement enumeration of task folders in registry.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 18ccad835190731c0f9ed34d7358aba00e3c7d55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18ccad835190731c0f9ed34d7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:54:41 2014 +0900 taskschd: Implement enumeration of task folders in registry. --- dlls/taskschd/folder_collection.c | 115 ++++++++++++++++++++++++++++++++++++- 1 file changed, 114 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index 4448667..f1a3f3f 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -31,10 +31,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(taskschd); +static const char root[] = "Software\\Microsoft\\Windows NT\\CurrentVersion\\Schedule\\TaskCache\\Tree"; + typedef struct { ITaskFolderCollection ITaskFolderCollection_iface; LONG ref; + WCHAR *path; + LPWSTR *list; + LONG count; } TaskFolderCollection; static inline TaskFolderCollection *impl_from_ITaskFolderCollection(ITaskFolderCollection *iface) @@ -48,6 +53,16 @@ static ULONG WINAPI folders_AddRef(ITaskFolderCollection *iface) return InterlockedIncrement(&folders->ref); } +static void free_list(LPWSTR *list, LONG count) +{ + LONG i; + + for (i = 0; i < count; i++) + heap_free(list[i]); + + heap_free(list); +} + static ULONG WINAPI folders_Release(ITaskFolderCollection *iface) { TaskFolderCollection *folders = impl_from_ITaskFolderCollection(iface); @@ -56,6 +71,8 @@ static ULONG WINAPI folders_Release(ITaskFolderCollection *iface) if (!ref) { TRACE("destroying %p\n", iface); + free_list(folders->list, folders->count); + heap_free(folders->path); heap_free(folders); } @@ -140,15 +157,111 @@ static const ITaskFolderCollectionVtbl TaskFolderCollection_vtbl = folders_get__NewEnum }; +static HRESULT reg_open_folder(const WCHAR *path, HKEY *hfolder) +{ + HKEY hroot; + DWORD ret; + + ret = RegCreateKeyA(HKEY_LOCAL_MACHINE, root, &hroot); + if (ret) return HRESULT_FROM_WIN32(ret); + + while (*path == '\\') path++; + ret = RegOpenKeyExW(hroot, path, 0, KEY_ALL_ACCESS, hfolder); + if (ret == ERROR_FILE_NOT_FOUND) + ret = ERROR_PATH_NOT_FOUND; + + RegCloseKey(hroot); + + return HRESULT_FROM_WIN32(ret); +} + +static inline void reg_close_folder(HKEY hfolder) +{ + RegCloseKey(hfolder); +} + +static HRESULT create_folders_list(const WCHAR *path, LPWSTR **folders_list, LONG *folders_count) +{ + HRESULT hr; + HKEY hfolder; + WCHAR name[MAX_PATH]; + LONG ret, idx, allocated, count; + LPWSTR *list; + + *folders_list = NULL; + *folders_count = 0; + + hr = reg_open_folder(path, &hfolder); + if (hr) return hr; + + allocated = 64; + list = heap_alloc(allocated * sizeof(LPWSTR)); + if (!list) + { + reg_close_folder(hfolder); + return E_OUTOFMEMORY; + } + + idx = count = 0; + + while (!(ret = RegEnumKeyW(hfolder, idx++, name, MAX_PATH))) + { + /* FIXME: differentiate between folders and tasks */ + if (count >= allocated) + { + LPWSTR *new_list; + allocated *= 2; + new_list = heap_realloc(list, allocated * sizeof(LPWSTR)); + if (!new_list) + { + reg_close_folder(hfolder); + free_list(list, count); + return E_OUTOFMEMORY; + } + list = new_list; + } + + list[count] = heap_strdupW(name); + if (!list[count]) + { + reg_close_folder(hfolder); + free_list(list, count); + return E_OUTOFMEMORY; + } + + count++; + } + + reg_close_folder(hfolder); + + *folders_list = list; + *folders_count = count; + + return S_OK; +} + HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **obj) { TaskFolderCollection *folders; + HRESULT hr; + LPWSTR *list; + LONG count; + + hr = create_folders_list(path, &list, &count); + if (hr) return hr; folders = heap_alloc(sizeof(*folders)); - if (!folders) return E_OUTOFMEMORY; + if (!folders) + { + free_list(list, count); + return E_OUTOFMEMORY; + } folders->ITaskFolderCollection_iface.lpVtbl = &TaskFolderCollection_vtbl; folders->ref = 1; + folders->path = heap_strdupW(path); + folders->count = count; + folders->list = list; *obj = &folders->ITaskFolderCollection_iface; TRACE("created %p\n", *obj);

1 0

Dmitry Timoshkov : taskschd: Implement ITaskFolderCollection::get_Item.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: eeffc8f073522c2ceb5f34a6c8618c625d68ede5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeffc8f073522c2ceb5f34a6c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:54:45 2014 +0900 taskschd: Implement ITaskFolderCollection::get_Item. --- dlls/taskschd/folder_collection.c | 59 ++++++++++++++++++++++++++++++++++--- dlls/taskschd/tests/scheduler.c | 12 ++++---- 2 files changed, 61 insertions(+), 10 deletions(-) diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index f1a3f3f..e8e4933 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -127,14 +127,65 @@ static HRESULT WINAPI folders_Invoke(ITaskFolderCollection *iface, DISPID dispid static HRESULT WINAPI folders_get_Count(ITaskFolderCollection *iface, LONG *count) { - FIXME("%p,%p: stub\n", iface, count); - return E_NOTIMPL; + TaskFolderCollection *folders = impl_from_ITaskFolderCollection(iface); + + TRACE("%p,%p\n", iface, count); + + if (!count) return E_POINTER; + + *count = folders->count; + + return S_OK; +} + +static LONG get_var_int(const VARIANT *var) +{ + switch(V_VT(var)) + { + case VT_I1: + case VT_UI1: + return V_UI1(var); + + case VT_I2: + case VT_UI2: + return V_UI2(var); + + case VT_I4: + case VT_UI4: + return V_UI4(var); + + case VT_I8: + case VT_UI8: + return V_UI8(var); + + case VT_INT: + case VT_UINT: + return V_UINT(var); + + default: + FIXME("unsupported variant type %d\n", V_VT(var)); + return 0; + } } static HRESULT WINAPI folders_get_Item(ITaskFolderCollection *iface, VARIANT index, ITaskFolder **folder) { - FIXME("%p,%s,%p: stub\n", iface, debugstr_variant(&index), folder); - return E_NOTIMPL; + TaskFolderCollection *folders = impl_from_ITaskFolderCollection(iface); + LONG idx; + + TRACE("%p,%s,%p\n", iface, debugstr_variant(&index), folder); + + if (!folder) return E_POINTER; + + if (V_VT(&index) == VT_BSTR) + return TaskFolder_create(folders->path, V_BSTR(&index), folder, FALSE); + + idx = get_var_int(&index); + /* collections are 1 based */ + if (idx < 1 || idx > folders->count) + return E_INVALIDARG; + + return TaskFolder_create(folders->path, folders->list[idx - 1], folder, FALSE); } static HRESULT WINAPI folders_get__NewEnum(ITaskFolderCollection *iface, IUnknown **penum) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 700fab2..d9f622e 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -455,11 +455,12 @@ static void test_FolderCollection(void) ITaskFolder_Release(folder); + hr = ITaskFolderCollection_get_Count(folders, NULL); + ok (hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + count = 0; hr = ITaskFolderCollection_get_Count(folders, &count); -todo_wine ok(hr == S_OK, "get_Count error %#x\n", hr); -todo_wine ok(count == 2, "expected 2, got %d\n", count); hr = ITaskFolder_CreateFolder(root, Wine_Folder3, v_null, &subfolder); @@ -468,12 +469,8 @@ todo_wine count = 0; hr = ITaskFolderCollection_get_Count(folders, &count); -todo_wine ok(hr == S_OK, "get_Count error %#x\n", hr); -todo_wine ok(count == 2, "expected 2, got %d\n", count); - /* FIXME: remove once implemented */ - if (!count) goto failed; for (i = 0; i < sizeof(vt)/sizeof(vt[0]); i++) { @@ -547,7 +544,10 @@ todo_wine ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); hr = ITaskFolderCollection_get__NewEnum(folders, &unknown); +todo_wine ok(hr == S_OK, "get__NewEnum error %#x\n", hr); + /* FIXME: remove once implemented */ + if (hr != S_OK) goto failed; hr = IUnknown_QueryInterface(unknown, &IID_IEnumUnknown, (void **)&enumvar); ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); hr = IUnknown_QueryInterface(unknown, &IID_IEnumVARIANT, (void **)&enumvar);

1 0

Dmitry Timoshkov : taskschd: Implement ITaskFolderCollection:: get__NewEnum.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: d33c0e14ae7088e608a6bfb30008774f1905eb1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d33c0e14ae7088e608a6bfb30… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:54:48 2014 +0900 taskschd: Implement ITaskFolderCollection::get__NewEnum. --- dlls/taskschd/folder_collection.c | 157 ++++++++++++++++++++++++++++++++++++- dlls/taskschd/tests/scheduler.c | 4 - 2 files changed, 155 insertions(+), 6 deletions(-) diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index e8e4933..c8cc89b 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -42,6 +42,8 @@ typedef struct LONG count; } TaskFolderCollection; +static HRESULT NewEnum_create(TaskFolderCollection *folders, IUnknown **obj); + static inline TaskFolderCollection *impl_from_ITaskFolderCollection(ITaskFolderCollection *iface) { return CONTAINING_RECORD(iface, TaskFolderCollection, ITaskFolderCollection_iface); @@ -190,8 +192,13 @@ static HRESULT WINAPI folders_get_Item(ITaskFolderCollection *iface, VARIANT ind static HRESULT WINAPI folders_get__NewEnum(ITaskFolderCollection *iface, IUnknown **penum) { - FIXME("%p,%p: stub\n", iface, penum); - return E_NOTIMPL; + TaskFolderCollection *folders = impl_from_ITaskFolderCollection(iface); + + TRACE("%p,%p\n", iface, penum); + + if (!penum) return E_POINTER; + + return NewEnum_create(folders, penum); } static const ITaskFolderCollectionVtbl TaskFolderCollection_vtbl = @@ -319,3 +326,149 @@ HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **o return S_OK; } + +typedef struct +{ + IEnumVARIANT IEnumVARIANT_iface; + LONG ref, pos; + TaskFolderCollection *folders; +} EnumVARIANT; + +static inline EnumVARIANT *impl_from_IEnumVARIANT(IEnumVARIANT *iface) +{ + return CONTAINING_RECORD(iface, EnumVARIANT, IEnumVARIANT_iface); +} + +static HRESULT WINAPI enumvar_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **obj) +{ + if (!riid || !obj) return E_INVALIDARG; + + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IEnumVARIANT) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IEnumVARIANT_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI enumvar_AddRef(IEnumVARIANT *iface) +{ + EnumVARIANT *enumvar = impl_from_IEnumVARIANT(iface); + return InterlockedIncrement(&enumvar->ref); +} + +static ULONG WINAPI enumvar_Release(IEnumVARIANT *iface) +{ + EnumVARIANT *enumvar = impl_from_IEnumVARIANT(iface); + LONG ref = InterlockedDecrement(&enumvar->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + ITaskFolderCollection_Release(&enumvar->folders->ITaskFolderCollection_iface); + heap_free(enumvar); + } + + return ref; +} + +static HRESULT WINAPI enumvar_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *var, ULONG *fetched) +{ + EnumVARIANT *enumvar = impl_from_IEnumVARIANT(iface); + LONG i; + + TRACE("%p,%u,%p,%p\n", iface, celt, var, fetched); + + for (i = 0; i < celt && enumvar->pos < enumvar->folders->count; i++) + { + ITaskFolder *folder; + HRESULT hr; + + hr = TaskFolder_create(enumvar->folders->path, enumvar->folders->list[enumvar->pos++], &folder, FALSE); + if (hr) return hr; + + if (!var) + { + ITaskFolder_Release(folder); + return E_POINTER; + } + + V_VT(&var[i]) = VT_DISPATCH; + V_DISPATCH(&var[i]) = (IDispatch *)folder; + } + + if (fetched) *fetched = i; + + return i == celt ? S_OK : S_FALSE; +} + +static HRESULT WINAPI enumvar_Skip(IEnumVARIANT *iface, ULONG celt) +{ + EnumVARIANT *enumvar = impl_from_IEnumVARIANT(iface); + + TRACE("%p,%u\n", iface, celt); + + enumvar->pos += celt; + + if (enumvar->pos > enumvar->folders->count) + { + enumvar->pos = enumvar->folders->count; + return S_FALSE; + } + + return S_OK; +} + +static HRESULT WINAPI enumvar_Reset(IEnumVARIANT *iface) +{ + EnumVARIANT *enumvar = impl_from_IEnumVARIANT(iface); + + TRACE("%p\n", iface); + + enumvar->pos = 0; + + return S_OK; +} + +static HRESULT WINAPI enumvar_Clone(IEnumVARIANT *iface, IEnumVARIANT **penum) +{ + FIXME("%p,%p: stub\n", iface, penum); + return E_NOTIMPL; +} + +static const struct IEnumVARIANTVtbl EnumVARIANT_vtbl = +{ + enumvar_QueryInterface, + enumvar_AddRef, + enumvar_Release, + enumvar_Next, + enumvar_Skip, + enumvar_Reset, + enumvar_Clone +}; + +static HRESULT NewEnum_create(TaskFolderCollection *folders, IUnknown **obj) +{ + EnumVARIANT *enumvar; + + enumvar = heap_alloc(sizeof(*enumvar)); + if (!enumvar) return E_OUTOFMEMORY; + + enumvar->IEnumVARIANT_iface.lpVtbl = &EnumVARIANT_vtbl; + enumvar->ref = 1; + enumvar->pos = 0; + enumvar->folders = folders; + ITaskFolderCollection_AddRef(&folders->ITaskFolderCollection_iface); + + *obj = (IUnknown *)&enumvar->IEnumVARIANT_iface; + + TRACE("created %p\n", *obj); + + return S_OK; +} diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index d9f622e..f30a1be 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -544,10 +544,7 @@ static void test_FolderCollection(void) ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); hr = ITaskFolderCollection_get__NewEnum(folders, &unknown); -todo_wine ok(hr == S_OK, "get__NewEnum error %#x\n", hr); - /* FIXME: remove once implemented */ - if (hr != S_OK) goto failed; hr = IUnknown_QueryInterface(unknown, &IID_IEnumUnknown, (void **)&enumvar); ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); hr = IUnknown_QueryInterface(unknown, &IID_IEnumVARIANT, (void **)&enumvar); @@ -592,7 +589,6 @@ todo_wine IDispatch_Release(V_DISPATCH(&var[0])); IDispatch_Release(V_DISPATCH(&var[1])); -failed: ITaskFolderCollection_Release(folders); hr = ITaskFolder_DeleteFolder(root, Wine_Folder1, 0);

1 0

Dmitry Timoshkov : taskschd: Implement IEnumVARIANT:: Clone for a folder collection.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: b5ed10c5ca1532c4bd4786e6973e9ddfc3330bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ed10c5ca1532c4bd4786e69… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:54:52 2014 +0900 taskschd: Implement IEnumVARIANT::Clone for a folder collection. --- dlls/taskschd/folder_collection.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index c8cc89b..1b8c39d 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -438,8 +438,11 @@ static HRESULT WINAPI enumvar_Reset(IEnumVARIANT *iface) static HRESULT WINAPI enumvar_Clone(IEnumVARIANT *iface, IEnumVARIANT **penum) { - FIXME("%p,%p: stub\n", iface, penum); - return E_NOTIMPL; + EnumVARIANT *enumvar = impl_from_IEnumVARIANT(iface); + + TRACE("%p,%p\n", iface, penum); + + return NewEnum_create(enumvar->folders, (IUnknown **)penum); } static const struct IEnumVARIANTVtbl EnumVARIANT_vtbl =

1 0

Dmitry Timoshkov : taskschd: Add some tests for ITaskFolderCollection:: get__NewEnum.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 979e2d3a4e5648f25a23b3b49a808121d1bae863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=979e2d3a4e5648f25a23b3b49… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:54:56 2014 +0900 taskschd: Add some tests for ITaskFolderCollection::get__NewEnum. --- dlls/taskschd/tests/scheduler.c | 59 +++++++++++++++++++++++++++++++++++---- 1 file changed, 54 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index f30a1be..3499d5e 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -414,7 +414,7 @@ static void test_FolderCollection(void) ITaskFolderCollection *folders; IUnknown *unknown; IEnumVARIANT *enumvar; - LONG count, i; + ULONG count, i; VARIANT idx; static const int vt[] = { VT_I1, VT_I2, VT_I4, VT_I8, VT_UI1, VT_UI2, VT_UI4, VT_UI8, VT_INT, VT_UINT }; @@ -459,7 +459,7 @@ static void test_FolderCollection(void) ok (hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); count = 0; - hr = ITaskFolderCollection_get_Count(folders, &count); + hr = ITaskFolderCollection_get_Count(folders, (LONG *)&count); ok(hr == S_OK, "get_Count error %#x\n", hr); ok(count == 2, "expected 2, got %d\n", count); @@ -468,10 +468,14 @@ static void test_FolderCollection(void) ITaskFolder_Release(subfolder); count = 0; - hr = ITaskFolderCollection_get_Count(folders, &count); + hr = ITaskFolderCollection_get_Count(folders, (LONG *)&count); ok(hr == S_OK, "get_Count error %#x\n", hr); ok(count == 2, "expected 2, got %d\n", count); + set_var(VT_INT, &idx, 0); + hr = ITaskFolderCollection_get_Item(folders, idx, NULL); + ok (hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + for (i = 0; i < sizeof(vt)/sizeof(vt[0]); i++) { set_var(vt[i], &idx, 1); @@ -543,6 +547,9 @@ static void test_FolderCollection(void) hr = ITaskFolderCollection_QueryInterface(folders, &IID_IEnumUnknown, (void **)&enumvar); ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); + hr = ITaskFolderCollection_get__NewEnum(folders, NULL); + ok (hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + hr = ITaskFolderCollection_get__NewEnum(folders, &unknown); ok(hr == S_OK, "get__NewEnum error %#x\n", hr); hr = IUnknown_QueryInterface(unknown, &IID_IEnumUnknown, (void **)&enumvar); @@ -554,9 +561,51 @@ static void test_FolderCollection(void) hr = IUnknown_QueryInterface(unknown, &IID_IUnknown, (void **)&enumvar); ok(hr == S_OK, "QueryInterface error %#x\n", hr); + hr = IEnumVARIANT_Skip(enumvar, 0); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + hr = IEnumVARIANT_Skip(enumvar, 2); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + hr = IEnumVARIANT_Skip(enumvar, 1); + ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); + + hr = IEnumVARIANT_Reset(enumvar); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + count = -1; + hr = IEnumVARIANT_Next(enumvar, 1, NULL, &count); + ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + memset(var, 0, sizeof(var)); - count = 0; - hr = IEnumVARIANT_Next(enumvar, 3, var, (ULONG *)&count); + count = -1; + hr = IEnumVARIANT_Next(enumvar, 1, var, &count); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + ok(count == 1, "expected 1, got %d\n", count); + hr = ITaskFolder_get_Path((ITaskFolder *)V_DISPATCH(&var[0]), &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine_Folder2), "expected \\Wine\\Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = ITaskFolder_get_Name((ITaskFolder *)V_DISPATCH(&var[0]), &bstr); + ok(hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); + IDispatch_Release(V_DISPATCH(&var[0])); + + memset(var, 0, sizeof(var)); + count = -1; + hr = IEnumVARIANT_Next(enumvar, 1, var, &count); + ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); + ok(count == 0, "expected 0, got %d\n", count); + + count = -1; + hr = IEnumVARIANT_Next(enumvar, 1, NULL, &count); + ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); + ok(count == 0, "expected 0, got %d\n", count); + + hr = IEnumVARIANT_Reset(enumvar); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + memset(var, 0, sizeof(var)); + count = -1; + hr = IEnumVARIANT_Next(enumvar, 3, var, &count); ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); ok(count == 2, "expected 2, got %d\n", count); ok(V_VT(&var[0]) == VT_DISPATCH, "expected VT_DISPATCH, got %d\n", V_VT(&var[0]));

1 0