December 2013 - Wine-commits

Frédéric Delanoy : msxml3/tests: Constify some character strings.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: 8a4e5ec68bbf1d885ca7c923f0fccb6a45e85451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a4e5ec68bbf1d885ca7c923f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 26 22:49:28 2013 +0100 msxml3/tests: Constify some character strings. --- dlls/msxml3/tests/domdoc.c | 58 ++++++++++++++++++++++---------------------- 1 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3ff85a0..df11197 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -866,41 +866,41 @@ static const WCHAR szDocument[] = { }; static const WCHAR szOpen[] = { 'o','p','e','n',0 }; -static WCHAR szdl[] = { 'd','l',0 }; +static const WCHAR szdl[] = { 'd','l',0 }; static const WCHAR szvr[] = { 'v','r',0 }; static const WCHAR szlc[] = { 'l','c',0 }; -static WCHAR szbs[] = { 'b','s',0 }; +static const WCHAR szbs[] = { 'b','s',0 }; static const WCHAR szstr1[] = { 's','t','r','1',0 }; static const WCHAR szstr2[] = { 's','t','r','2',0 }; static const WCHAR szstar[] = { '*',0 }; static const WCHAR szfn1_txt[] = {'f','n','1','.','t','x','t',0}; -static WCHAR szComment[] = {'A',' ','C','o','m','m','e','n','t',0 }; -static WCHAR szCommentXML[] = {'<','!','-','-','A',' ','C','o','m','m','e','n','t','-','-','>',0 }; -static WCHAR szCommentNodeText[] = {'#','c','o','m','m','e','n','t',0 }; +static const WCHAR szComment[] = {'A',' ','C','o','m','m','e','n','t',0 }; +static const WCHAR szCommentXML[] = {'<','!','-','-','A',' ','C','o','m','m','e','n','t','-','-','>',0 }; +static const WCHAR szCommentNodeText[] = {'#','c','o','m','m','e','n','t',0 }; static WCHAR szElement[] = {'E','l','e','T','e','s','t', 0 }; -static WCHAR szElementXML[] = {'<','E','l','e','T','e','s','t','/','>',0 }; -static WCHAR szElementXML2[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','/','>',0 }; -static WCHAR szElementXML3[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','>', - 'T','e','s','t','i','n','g','N','o','d','e','<','/','E','l','e','T','e','s','t','>',0 }; -static WCHAR szElementXML4[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','>', - '&','a','m','p',';','x',' ',0x2103,'<','/','E','l','e','T','e','s','t','>',0 }; - -static WCHAR szAttribute[] = {'A','t','t','r',0 }; -static WCHAR szAttributeXML[] = {'A','t','t','r','=','"','"',0 }; - -static WCHAR szCData[] = {'[','1',']','*','2','=','3',';',' ','&','g','e','e',' ','t','h','a','t','s', - ' ','n','o','t',' ','r','i','g','h','t','!', 0}; -static WCHAR szCDataXML[] = {'<','!','[','C','D','A','T','A','[','[','1',']','*','2','=','3',';',' ','&', - 'g','e','e',' ','t','h','a','t','s',' ','n','o','t',' ','r','i','g','h','t', - '!',']',']','>',0}; -static WCHAR szCDataNodeText[] = {'#','c','d','a','t','a','-','s','e','c','t','i','o','n',0 }; -static WCHAR szDocFragmentText[] = {'#','d','o','c','u','m','e','n','t','-','f','r','a','g','m','e','n','t',0 }; - -static WCHAR szEntityRef[] = {'e','n','t','i','t','y','r','e','f',0 }; -static WCHAR szEntityRefXML[] = {'&','e','n','t','i','t','y','r','e','f',';',0 }; -static WCHAR szStrangeChars[] = {'&','x',' ',0x2103, 0}; +static const WCHAR szElementXML[] = {'<','E','l','e','T','e','s','t','/','>',0 }; +static const WCHAR szElementXML2[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','/','>',0 }; +static const WCHAR szElementXML3[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','>', + 'T','e','s','t','i','n','g','N','o','d','e','<','/','E','l','e','T','e','s','t','>',0 }; +static const WCHAR szElementXML4[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','>', + '&','a','m','p',';','x',' ',0x2103,'<','/','E','l','e','T','e','s','t','>',0 }; + +static const WCHAR szAttribute[] = {'A','t','t','r',0 }; +static const WCHAR szAttributeXML[] = {'A','t','t','r','=','"','"',0 }; + +static const WCHAR szCData[] = {'[','1',']','*','2','=','3',';',' ','&','g','e','e',' ','t','h','a','t','s', + ' ','n','o','t',' ','r','i','g','h','t','!', 0}; +static const WCHAR szCDataXML[] = {'<','!','[','C','D','A','T','A','[','[','1',']','*','2','=','3',';',' ','&', + 'g','e','e',' ','t','h','a','t','s',' ','n','o','t',' ','r','i','g','h','t', + '!',']',']','>',0}; +static const WCHAR szCDataNodeText[] = {'#','c','d','a','t','a','-','s','e','c','t','i','o','n',0 }; +static const WCHAR szDocFragmentText[] = {'#','d','o','c','u','m','e','n','t','-','f','r','a','g','m','e','n','t',0 }; + +static const WCHAR szEntityRef[] = {'e','n','t','i','t','y','r','e','f',0 }; +static const WCHAR szEntityRefXML[] = {'&','e','n','t','i','t','y','r','e','f',';',0 }; +static const WCHAR szStrangeChars[] = {'&','x',' ',0x2103, 0}; #define expect_bstr_eq_and_free(bstr, expect) { \ BSTR bstrExp = alloc_str_from_narrow(expect); \ @@ -3392,7 +3392,7 @@ static void test_get_childNodes(void) static void test_get_firstChild(void) { - static WCHAR xmlW[] = {'x','m','l',0}; + static const WCHAR xmlW[] = {'x','m','l',0}; IXMLDOMDocument *doc; IXMLDOMNode *node; VARIANT_BOOL b; @@ -3422,8 +3422,8 @@ static void test_get_firstChild(void) static void test_get_lastChild(void) { - static WCHAR lcW[] = {'l','c',0}; - static WCHAR foW[] = {'f','o',0}; + static const WCHAR lcW[] = {'l','c',0}; + static const WCHAR foW[] = {'f','o',0}; IXMLDOMDocument *doc; IXMLDOMNode *node, *child; VARIANT_BOOL b;

1 0

Frédéric Delanoy : oleaut32/tests: Constify some character strings.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: dfe6a9b20012ba03f8c0917713340e795a0cc02e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfe6a9b20012ba03f8c091771… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 26 22:49:31 2013 +0100 oleaut32/tests: Constify some character strings. --- dlls/oleaut32/tests/tmarshal.c | 2 +- dlls/oleaut32/tests/typelib.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index d493327..1a3effe 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1195,7 +1195,7 @@ static void test_typelibmarshal(void) { static const WCHAR szCat[] = { 'C','a','t',0 }; static const WCHAR szTestTest[] = { 'T','e','s','t','T','e','s','t',0 }; - static WCHAR szSuperman[] = { 'S','u','p','e','r','m','a','n',0 }; + static const WCHAR szSuperman[] = { 'S','u','p','e','r','m','a','n',0 }; HRESULT hr; IKindaEnumWidget *pKEW = KindaEnumWidget_Create(); IWidget *pWidget; diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 80e3b99..20e53fb 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1529,8 +1529,8 @@ static void test_CreateTypeLib(SYSKIND sys) { static OLECHAR interface3W[] = {'i','n','t','e','r','f','a','c','e','3',0}; static OLECHAR dualW[] = {'d','u','a','l',0}; static OLECHAR coclassW[] = {'c','o','c','l','a','s','s',0}; - static WCHAR defaultW[] = {'d','e','f','a','u','l','t',0x3213,0}; - static WCHAR defaultQW[] = {'d','e','f','a','u','l','t','?',0}; + static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0x3213,0}; + static const WCHAR defaultQW[] = {'d','e','f','a','u','l','t','?',0}; static OLECHAR func1W[] = {'f','u','n','c','1',0}; static OLECHAR func2W[] = {'f','u','n','c','2',0}; static OLECHAR prop1W[] = {'P','r','o','p','1',0};

1 0

Frédéric Delanoy : ole32/tests: Constify some character strings.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: 43d05cc59e7281c610dc05c5a11f242bce4aa1d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d05cc59e7281c610dc05c5a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 26 22:49:30 2013 +0100 ole32/tests: Constify some character strings. --- dlls/ole32/tests/compobj.c | 4 ++-- dlls/ole32/tests/storage32.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 8c4d6a8..b615034 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -65,9 +65,9 @@ static const GUID IID_TestPS = { 0x66666666, 0x8888, 0x7777, { 0x66, 0x66, 0x55, DEFINE_GUID(CLSID_InProcFreeMarshaler, 0x0000033a,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -static WCHAR stdfont[] = {'S','t','d','F','o','n','t',0}; +static const WCHAR stdfont[] = {'S','t','d','F','o','n','t',0}; static const WCHAR wszNonExistent[] = {'N','o','n','E','x','i','s','t','e','n','t',0}; -static WCHAR wszCLSID_StdFont[] = +static const WCHAR wszCLSID_StdFont[] = { '{','0','b','e','3','5','2','0','3','-','8','f','9','1','-','1','1','c','e','-', '9','d','e','3','-','0','0','a','a','0','0','4','b','b','8','5','1','}',0 diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 06d2fa4..b298f8d 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -2174,7 +2174,7 @@ static void test_fmtusertypestg(void) static const char fileA[] = {'f','m','t','t','e','s','t',0}; static const WCHAR fileW[] = {'f','m','t','t','e','s','t',0}; static WCHAR userTypeW[] = {'S','t','g','U','s','r','T','y','p','e',0}; - static WCHAR strmNameW[] = {1,'C','o','m','p','O','b','j',0}; + static const WCHAR strmNameW[] = {1,'C','o','m','p','O','b','j',0}; hr = StgCreateDocfile( fileW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &stg); ok(hr == S_OK, "should succeed, res=%x\n", hr);

1 0

Frédéric Delanoy : oledb32/tests: Constify some character strings.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: 0a51a8203b6ccbf0360f341f4ed1d8ce70d438a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a51a8203b6ccbf0360f341f4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 26 22:49:32 2013 +0100 oledb32/tests: Constify some character strings. --- dlls/oledb32/tests/convert.c | 2 +- dlls/oledb32/tests/database.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index b42b4df..3e78f24 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2617,7 +2617,7 @@ static void test_converttodbdate(void) { DBLENGTH dst_len; HRESULT hr; - static WCHAR strW[] = {'2','0','1','3','-','0','5','-','1','4',0}; + static const WCHAR strW[] = {'2','0','1','3','-','0','5','-','1','4',0}; DBDATE ts = {2013, 5, 14}; DBDATE dst; DBSTATUS dst_status; diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 13637c1..fa56e56 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -209,9 +209,9 @@ static void test_errorinfo(void) static void test_initializationstring(void) { - static WCHAR initstring_msdasql[] = {'P','r','o','v','i','d','e','r','=','M','S','D','A','S','Q','L','.','1',';', + static const WCHAR initstring_msdasql[] = {'P','r','o','v','i','d','e','r','=','M','S','D','A','S','Q','L','.','1',';', 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y', 0}; - static WCHAR initstring_sqloledb[] = {'P','r','o','v','i','d','e','r','=','S','Q','L','O','L','E','D','B','.','1',';', + static const WCHAR initstring_sqloledb[] = {'P','r','o','v','i','d','e','r','=','S','Q','L','O','L','E','D','B','.','1',';', 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y', 0}; IDataInitialize *datainit = NULL; IDBInitialize *dbinit = NULL;

1 0

Dmitry Timoshkov : include: Add Task Scheduler typelib definition.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: bf546ac873f97f05f872d602f21d3fa9110d24ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf546ac873f97f05f872d602f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 24 19:55:48 2013 +0900 include: Add Task Scheduler typelib definition. --- include/taskschd.idl | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/include/taskschd.idl b/include/taskschd.idl index d736788..3b6bc2f 100644 --- a/include/taskschd.idl +++ b/include/taskschd.idl @@ -21,7 +21,13 @@ import "oaidl.idl"; import "ocidl.idl"; -cpp_quote("DEFINE_GUID(CLSID_TaskScheduler, 0xf87369f,0xa4e5,0x4cfc,0xbd,0x3e,0x73,0xe6,0x15,0x45,0x72,0xdd);") +[ + uuid(e34cb9f1-c7f7-424c-be29-027dcc09363a), + version(1.0) +] +library TaskScheduler +{ +importlib("stdole2.tlb"); typedef enum _TASK_STATE { @@ -506,3 +512,16 @@ interface IPrincipal : IDispatch [propget] HRESULT RunLevel([out, retval] TASK_RUNLEVEL *level); [propput] HRESULT RunLevel([in] TASK_RUNLEVEL level); } + +[ + threading(both), + progid("Schedule.Service.1"), + vi_progid("Schedule.Service"), + uuid(0f87369f-a4e5-4cfc-bd3e-73e6154572dd) +] +coclass TaskScheduler +{ + interface ITaskService; +} + +} /* library TaskScheduler */

1 0

Dmitry Timoshkov : taskschd: Add ITaskService stub implementation.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: b06009640024900c5c2a6537b80550c31d08cf17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b06009640024900c5c2a6537b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 24 19:55:53 2013 +0900 taskschd: Add ITaskService stub implementation. --- dlls/taskschd/Makefile.in | 1 + dlls/taskschd/task.c | 200 ++++++++++++++++++++++++++++++++++++++ dlls/taskschd/taskschd.c | 32 ++++++ dlls/taskschd/taskschd_private.h | 21 ++++ 4 files changed, 254 insertions(+), 0 deletions(-) diff --git a/dlls/taskschd/Makefile.in b/dlls/taskschd/Makefile.in index 39e6c5b..f5f758f 100644 --- a/dlls/taskschd/Makefile.in +++ b/dlls/taskschd/Makefile.in @@ -1,6 +1,7 @@ MODULE = taskschd.dll C_SRCS = \ + task.c \ taskschd.c @MAKE_DLL_RULES@ diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c new file mode 100644 index 0000000..87d9273 --- /dev/null +++ b/dlls/taskschd/task.c @@ -0,0 +1,200 @@ +/* + * Copyright 2013 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 "initguid.h" +#include "objbase.h" +#include "taskschd.h" +#include "taskschd_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(taskschd); + +typedef struct +{ + ITaskService ITaskService_iface; + LONG ref; +} TaskService; + +static inline TaskService *impl_from_ITaskService(ITaskService *iface) +{ + return CONTAINING_RECORD(iface, TaskService, ITaskService_iface); +} + +static ULONG WINAPI TaskService_AddRef(ITaskService *iface) +{ + TaskService *task_svc = impl_from_ITaskService(iface); + return InterlockedIncrement(&task_svc->ref); +} + +static ULONG WINAPI TaskService_Release(ITaskService *iface) +{ + TaskService *task_svc = impl_from_ITaskService(iface); + LONG ref = InterlockedDecrement(&task_svc->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + HeapFree(GetProcessHeap(), 0, task_svc); + } + + return ref; +} + +static HRESULT WINAPI TaskService_QueryInterface(ITaskService *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_ITaskService) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + ITaskService_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static HRESULT WINAPI TaskService_GetTypeInfoCount(ITaskService *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskService_GetTypeInfo(ITaskService *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskService_GetIDsOfNames(ITaskService *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 TaskService_Invoke(ITaskService *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 TaskService_GetFolder(ITaskService *iface, BSTR path, ITaskFolder **folder) +{ + FIXME("%p,%s,%p: stub\n", iface, debugstr_w(path), folder); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskService_GetRunningTasks(ITaskService *iface, LONG flags, IRunningTaskCollection **tasks) +{ + FIXME("%p,%x,%p: stub\n", iface, flags, tasks); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskService_NewTask(ITaskService *iface, DWORD flags, ITaskDefinition **definition) +{ + FIXME("%p,%x,%p: stub\n", iface, flags, definition); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, VARIANT user, VARIANT domain, VARIANT password) +{ + FIXME("%p,%s,%s,%s,%s: stub\n", iface, debugstr_variant(&server), debugstr_variant(&user), + debugstr_variant(&domain), debugstr_variant(&password)); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskService_get_Connected(ITaskService *iface, VARIANT_BOOL *connected) +{ + FIXME("%p,%p: stub\n", iface, connected); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskService_get_TargetServer(ITaskService *iface, BSTR *server) +{ + FIXME("%p,%p: stub\n", iface, server); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskService_get_ConnectedUser(ITaskService *iface, BSTR *user) +{ + FIXME("%p,%p: stub\n", iface, user); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskService_get_ConnectedDomain(ITaskService *iface, BSTR *domain) +{ + FIXME("%p,%p: stub\n", iface, domain); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskService_get_HighestVersion(ITaskService *iface, DWORD *version) +{ + FIXME("%p,%p: stub\n", iface, version); + return E_NOTIMPL; +} + +static const ITaskServiceVtbl TaskService_vtbl = +{ + TaskService_QueryInterface, + TaskService_AddRef, + TaskService_Release, + TaskService_GetTypeInfoCount, + TaskService_GetTypeInfo, + TaskService_GetIDsOfNames, + TaskService_Invoke, + TaskService_GetFolder, + TaskService_GetRunningTasks, + TaskService_NewTask, + TaskService_Connect, + TaskService_get_Connected, + TaskService_get_TargetServer, + TaskService_get_ConnectedUser, + TaskService_get_ConnectedDomain, + TaskService_get_HighestVersion +}; + +HRESULT TaskService_create(void **obj) +{ + TaskService *task_svc; + + task_svc = HeapAlloc(GetProcessHeap(), 0, sizeof(*task_svc)); + if (!task_svc) return E_OUTOFMEMORY; + + task_svc->ITaskService_iface.lpVtbl = &TaskService_vtbl; + task_svc->ref = 1; + *obj = &task_svc->ITaskService_iface; + + TRACE("created %p\n", *obj); + + return S_OK; +} diff --git a/dlls/taskschd/taskschd.c b/dlls/taskschd/taskschd.c index 241db94..df800a1 100644 --- a/dlls/taskschd/taskschd.c +++ b/dlls/taskschd/taskschd.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" +#include "objbase.h" #include "wine/debug.h" @@ -46,3 +47,34 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) } return TRUE; } + +const char *debugstr_variant(const VARIANT *v) +{ + if (!v) return "(null)"; + + switch (V_VT(v)) + { + case VT_EMPTY: + return "{VT_EMPTY}"; + case VT_NULL: + return "{VT_NULL}"; + case VT_I2: + return wine_dbg_sprintf("{VT_I2: %d}", V_I2(v)); + case VT_I4: + return wine_dbg_sprintf("{VT_I4: %d}", V_I4(v)); + case VT_R8: + return wine_dbg_sprintf("{VT_R8: %lf}", V_R8(v)); + case VT_BSTR: + return wine_dbg_sprintf("{VT_BSTR: %s}", debugstr_w(V_BSTR(v))); + case VT_DISPATCH: + return wine_dbg_sprintf("{VT_DISPATCH: %p}", V_DISPATCH(v)); + case VT_ERROR: + return wine_dbg_sprintf("{VT_ERROR: %08x}", V_ERROR(v)); + case VT_BOOL: + return wine_dbg_sprintf("{VT_BOOL: %x}", V_BOOL(v)); + case VT_UINT: + return wine_dbg_sprintf("{VT_UINT: %u}", V_UINT(v)); + default: + return wine_dbg_sprintf("{vt %d}", V_VT(v)); + } +} diff --git a/dlls/taskschd/taskschd_private.h b/dlls/taskschd/taskschd_private.h new file mode 100644 index 0000000..be6d318 --- /dev/null +++ b/dlls/taskschd/taskschd_private.h @@ -0,0 +1,21 @@ +/* + * Copyright 2013 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 + */ + +HRESULT TaskService_create(void **obj) DECLSPEC_HIDDEN; + +const char *debugstr_variant(const VARIANT *v) DECLSPEC_HIDDEN;

1 0

Dmitry Timoshkov : taskschd: Add Task Scheduler class factory.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: 58b1b6b77f45bab464f7614efb33c437eeeb8b48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58b1b6b77f45bab464f7614ef… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 24 19:55:56 2013 +0900 taskschd: Add Task Scheduler class factory. --- dlls/taskschd/taskschd.c | 113 +++++++++++++++++++++++++++++++++++++++++++ dlls/taskschd/taskschd.spec | 4 +- 2 files changed, 115 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/taskschd.c b/dlls/taskschd/taskschd.c index df800a1..4ad5f4c 100644 --- a/dlls/taskschd/taskschd.c +++ b/dlls/taskschd/taskschd.c @@ -26,11 +26,92 @@ #include "windef.h" #include "winbase.h" #include "objbase.h" +#include "taskschd.h" +#include "taskschd_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(taskschd); +typedef struct +{ + IClassFactory IClassFactory_iface; + HRESULT (*constructor)(void **); +} TaskScheduler_factory; + +static inline TaskScheduler_factory *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, TaskScheduler_factory, IClassFactory_iface); +} + +static HRESULT WINAPI factory_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *obj) +{ + if (!riid || !obj) return E_INVALIDARG; + + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IClassFactory)) + { + IClassFactory_AddRef(iface); + *obj = iface; + return S_OK; + } + + *obj = NULL; + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI factory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI factory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI factory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj) +{ + TaskScheduler_factory *factory = impl_from_IClassFactory(iface); + IUnknown *unknown; + HRESULT hr; + + if (!riid || !obj) return E_INVALIDARG; + + TRACE("%p,%s,%p\n", outer, debugstr_guid(riid), obj); + + *obj = NULL; + if (outer) return CLASS_E_NOAGGREGATION; + + hr = factory->constructor((void **)&unknown); + if (hr != S_OK) return hr; + + hr = IUnknown_QueryInterface(unknown, riid, obj); + IUnknown_Release(unknown); + + return hr; +} + +static HRESULT WINAPI factory_LockServer(IClassFactory *iface, BOOL lock) +{ + FIXME("%p,%d: stub\n", iface, lock); + return S_OK; +} + +static const struct IClassFactoryVtbl factory_vtbl = +{ + factory_QueryInterface, + factory_AddRef, + factory_Release, + factory_CreateInstance, + factory_LockServer +}; + +static TaskScheduler_factory TaskScheduler_cf = { { &factory_vtbl }, TaskService_create }; + /****************************************************************** * DllMain */ @@ -48,6 +129,38 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) return TRUE; } +/*********************************************************************** + * DllGetClassObject + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *obj) +{ + IClassFactory *factory = NULL; + + if (!rclsid || !riid || !obj) return E_INVALIDARG; + + TRACE("%s,%s,%p\n", debugstr_guid(rclsid), debugstr_guid(riid), obj); + + *obj = NULL; + + if (IsEqualGUID(rclsid, &CLSID_TaskScheduler)) + { + factory = &TaskScheduler_cf.IClassFactory_iface; + } + + if (factory) return IClassFactory_QueryInterface(factory, riid, obj); + + FIXME("class %s/%s is not implemented\n", debugstr_guid(rclsid), debugstr_guid(riid)); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllCanUnloadNow + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + const char *debugstr_variant(const VARIANT *v) { if (!v) return "(null)"; diff --git a/dlls/taskschd/taskschd.spec b/dlls/taskschd/taskschd.spec index b79e689..d7e3040 100644 --- a/dlls/taskschd/taskschd.spec +++ b/dlls/taskschd/taskschd.spec @@ -1,5 +1,5 @@ -@ stub DllCanUnloadNow -@ stub DllGetClassObject +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub DllGetVersion @ stub DllRegisterServer @ stub DllUnregisterServer

1 0

Dmitry Timoshkov : taskschd: Add registration for TaskScheduler interfaces.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: c0ecc1025776e18472aba21c15150f55a58bff82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0ecc1025776e18472aba21c1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 24 19:56:00 2013 +0900 taskschd: Add registration for TaskScheduler interfaces. --- configure | 2 +- configure.ac | 2 +- dlls/taskschd/Makefile.in | 2 ++ dlls/taskschd/taskschd.c | 20 ++++++++++++++++++++ dlls/taskschd/taskschd.spec | 4 ++-- dlls/taskschd/taskschd_tlb.idl | 21 +++++++++++++++++++++ 6 files changed, 47 insertions(+), 4 deletions(-) diff --git a/configure b/configure index de73ca9..50d5966 100755 --- a/configure +++ b/configure @@ -17152,7 +17152,7 @@ wine_fn_config_test dlls/sxs/tests sxs_test wine_fn_config_dll system.drv16 enable_win16 wine_fn_config_dll t2embed enable_t2embed wine_fn_config_dll tapi32 enable_tapi32 implib -wine_fn_config_dll taskschd enable_taskschd +wine_fn_config_dll taskschd enable_taskschd clean wine_fn_config_dll toolhelp.dll16 enable_win16 wine_fn_config_dll traffic enable_traffic wine_fn_config_dll twain.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index e0455a2..b4fc0b1 100644 --- a/configure.ac +++ b/configure.ac @@ -3195,7 +3195,7 @@ WINE_CONFIG_TEST(dlls/sxs/tests) WINE_CONFIG_DLL(system.drv16,enable_win16) WINE_CONFIG_DLL(t2embed) WINE_CONFIG_DLL(tapi32,,[implib]) -WINE_CONFIG_DLL(taskschd) +WINE_CONFIG_DLL(taskschd,,[clean]) WINE_CONFIG_DLL(toolhelp.dll16,enable_win16) WINE_CONFIG_DLL(traffic) WINE_CONFIG_DLL(twain.dll16,enable_win16) diff --git a/dlls/taskschd/Makefile.in b/dlls/taskschd/Makefile.in index f5f758f..e9a19e6 100644 --- a/dlls/taskschd/Makefile.in +++ b/dlls/taskschd/Makefile.in @@ -4,4 +4,6 @@ C_SRCS = \ task.c \ taskschd.c +IDL_TLB_SRCS = taskschd_tlb.idl + @MAKE_DLL_RULES@ diff --git a/dlls/taskschd/taskschd.c b/dlls/taskschd/taskschd.c index 4ad5f4c..ead8c5a 100644 --- a/dlls/taskschd/taskschd.c +++ b/dlls/taskschd/taskschd.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "objbase.h" +#include "rpcproxy.h" #include "taskschd.h" #include "taskschd_private.h" @@ -33,6 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(taskschd); +static HINSTANCE schd_instance; + typedef struct { IClassFactory IClassFactory_iface; @@ -123,6 +126,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: + schd_instance = hinst; DisableThreadLibraryCalls(hinst); break; } @@ -161,6 +165,22 @@ HRESULT WINAPI DllCanUnloadNow(void) return S_FALSE; } +/*********************************************************************** + * DllRegisterServer + */ +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources(schd_instance); +} + +/*********************************************************************** + * DllUnregisterServer + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources(schd_instance); +} + const char *debugstr_variant(const VARIANT *v) { if (!v) return "(null)"; diff --git a/dlls/taskschd/taskschd.spec b/dlls/taskschd/taskschd.spec index d7e3040..af75eea 100644 --- a/dlls/taskschd/taskschd.spec +++ b/dlls/taskschd/taskschd.spec @@ -1,5 +1,5 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub DllGetVersion -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/taskschd/taskschd_tlb.idl b/dlls/taskschd/taskschd_tlb.idl new file mode 100644 index 0000000..4083166 --- /dev/null +++ b/dlls/taskschd/taskschd_tlb.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2013 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 + */ + +#pragma makedep regtypelib + +#include "taskschd.idl"

1 0

Alexander Sørnes : po: Update Norwegian translation.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: d030a6c58844507c65894f5914bc17005ec6c63d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d030a6c58844507c65894f591… Author: Alexander Sørnes <alexsornes(a)gmail.com> Date: Thu Dec 26 02:49:38 2013 +0100 po: Update Norwegian translation. --- po/nb_NO.po | 1935 +++++++++++++++++++++++------------------------------------ 1 files changed, 761 insertions(+), 1174 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d030a6c58844507c65894…

1 0

Bruno Jesus : ws2_32: Normalize IPX protocol names using the WS prefix.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: 658c2b5f28c8286005ce9b218ebb8125b1274114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=658c2b5f28c8286005ce9b218… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Dec 27 13:48:40 2013 -0200 ws2_32: Normalize IPX protocol names using the WS prefix. --- dlls/ws2_32/socket.c | 20 ++++++++++---------- include/wsipx.h | 6 ++++++ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 39912bf..8f9c491 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -195,9 +195,9 @@ static const INT valid_protocols[] = { WS_IPPROTO_TCP, WS_IPPROTO_UDP, - NSPROTO_IPX, - NSPROTO_SPX, - NSPROTO_SPXII, + WS_NSPROTO_IPX, + WS_NSPROTO_SPX, + WS_NSPROTO_SPXII, 0 }; @@ -1641,7 +1641,7 @@ static BOOL WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) strcpyW( info->szProtocol, NameUdpW ); break; - case NSPROTO_IPX: + case WS_NSPROTO_IPX: info->dwServiceFlags1 = XP1_PARTIAL_MESSAGE | XP1_SUPPORT_BROADCAST | XP1_SUPPORT_MULTIPOINT | XP1_MESSAGE_ORIENTED | XP1_CONNECTIONLESS; @@ -1659,7 +1659,7 @@ static BOOL WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) strcpyW( info->szProtocol, NameIpxW ); break; - case NSPROTO_SPX: + case WS_NSPROTO_SPX: info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_PSEUDO_STREAM | XP1_MESSAGE_ORIENTED | XP1_GUARANTEED_ORDER | XP1_GUARANTEED_DELIVERY; @@ -1676,7 +1676,7 @@ static BOOL WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) strcpyW( info->szProtocol, NameSpxW ); break; - case NSPROTO_SPXII: + case WS_NSPROTO_SPXII: info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_GRACEFUL_CLOSE | XP1_PSEUDO_STREAM | XP1_MESSAGE_ORIENTED | XP1_GUARANTEED_ORDER | XP1_GUARANTEED_DELIVERY; @@ -3207,7 +3207,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, } /* end switch(optname) */ }/* end case WS_SOL_SOCKET */ #ifdef HAS_IPX - case NSPROTO_IPX: + case WS_NSPROTO_IPX: { struct WS_sockaddr_ipx addr; IPX_ADDRESS_DATA *data; @@ -3269,7 +3269,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, FIXME("IPX optname:%x\n", optname); return SOCKET_ERROR; }/* end switch(optname) */ - } /* end case NSPROTO_IPX */ + } /* end case WS_NSPROTO_IPX */ #endif #ifdef HAS_IRDA @@ -4752,7 +4752,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, break; /* case WS_SOL_SOCKET */ #ifdef HAS_IPX - case NSPROTO_IPX: + case WS_NSPROTO_IPX: switch(optname) { case IPX_PTYPE: @@ -4789,7 +4789,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, FIXME("opt_name:%x\n", optname); return SOCKET_ERROR; } - break; /* case NSPROTO_IPX */ + break; /* case WS_NSPROTO_IPX */ #endif /* Levels WS_IPPROTO_TCP and WS_IPPROTO_IP convert directly */ diff --git a/include/wsipx.h b/include/wsipx.h index 67609d8..6aa2946 100644 --- a/include/wsipx.h +++ b/include/wsipx.h @@ -36,9 +36,15 @@ typedef struct WS_sockaddr_ipx /* * constants */ +#ifndef USE_WS_PREFIX #define NSPROTO_IPX 1000 #define NSPROTO_SPX 1256 #define NSPROTO_SPXII 1257 +#else +#define WS_NSPROTO_IPX 1000 +#define WS_NSPROTO_SPX 1256 +#define WS_NSPROTO_SPXII 1257 +#endif #undef WS #endif /* _WINE_WSIPX_ */

1 0