February 2014 - Wine-commits

Dmitry Timoshkov : taskschd: ITaskService:: GetFolder should fail if not connected to the server.
by Alexandre Julliard 06 Feb '14

06 Feb '14

Module: wine Branch: master Commit: b3a79114e032520e9f3969bfed992ea2e820b5e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3a79114e032520e9f3969bfe… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 5 15:07:44 2014 +0900 taskschd: ITaskService::GetFolder should fail if not connected to the server. --- dlls/taskschd/task.c | 5 +++++ dlls/taskschd/tests/scheduler.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index c424700..09fe32a 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -113,10 +113,15 @@ static HRESULT WINAPI TaskService_Invoke(ITaskService *iface, DISPID dispid, REF static HRESULT WINAPI TaskService_GetFolder(ITaskService *iface, BSTR path, ITaskFolder **folder) { + TaskService *task_svc = impl_from_ITaskService(iface); + TRACE("%p,%s,%p\n", iface, debugstr_w(path), folder); if (!folder) return E_POINTER; + if (!task_svc->connected) + return HRESULT_FROM_WIN32(ERROR_ONLY_IF_CONNECTED); + return TaskFolder_create(path, NULL, folder, FALSE); } diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 3499d5e..be36069 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -142,6 +142,9 @@ static void test_GetFolder(void) return; } + hr = ITaskService_GetFolder(service, NULL, &folder); + ok(hr == HRESULT_FROM_WIN32(ERROR_ONLY_IF_CONNECTED), "expected ERROR_ONLY_IF_CONNECTED, got %#x\n", hr); + V_VT(&v_null) = VT_NULL; hr = ITaskService_Connect(service, v_null, v_null, v_null, v_null);

1 0

Dmitry Timoshkov : taskschd: Add a NULL check to ITaskFolder::GetFolders.
by Alexandre Julliard 06 Feb '14

06 Feb '14

Module: wine Branch: master Commit: 9c7025f92fb7bc0ac0235a1e5b7aeaabe38c6cd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c7025f92fb7bc0ac0235a1e5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 5 15:08:32 2014 +0900 taskschd: Add a NULL check to ITaskFolder::GetFolders. --- dlls/taskschd/folder.c | 2 ++ dlls/taskschd/tests/scheduler.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 8d8a1a3..0618c23 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -236,6 +236,8 @@ static HRESULT WINAPI TaskFolder_GetFolders(ITaskFolder *iface, LONG flags, ITas TRACE("%p,%x,%p: stub\n", iface, flags, folders); + if (!folders) return E_POINTER; + if (flags) FIXME("unsupported flags %x\n", flags); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index be36069..df00eb2 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -453,6 +453,9 @@ static void test_FolderCollection(void) hr = ITaskFolder_GetFolder(root, Wine, &folder); ok(hr == S_OK, "GetFolder error %#x\n", hr); + hr = ITaskFolder_GetFolders(folder, 0, NULL); + ok (hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + hr = ITaskFolder_GetFolders(folder, 0, &folders); ok(hr == S_OK, "GetFolders error %#x\n", hr);

1 0

Dmitry Timoshkov : taskschd: QueryInterface should return NULL interface on error.
by Alexandre Julliard 06 Feb '14

06 Feb '14

Module: wine Branch: master Commit: 4bd02f8e2d1164e8b56de73396c118412022d8b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bd02f8e2d1164e8b56de7339… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 5 15:09:11 2014 +0900 taskschd: QueryInterface should return NULL interface on error. --- dlls/taskschd/folder.c | 1 + dlls/taskschd/folder_collection.c | 2 ++ dlls/taskschd/task.c | 1 + 3 files changed, 4 insertions(+) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 0618c23..fd516d6 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -83,6 +83,7 @@ static HRESULT WINAPI TaskFolder_QueryInterface(ITaskFolder *iface, REFIID riid, } FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index 1b8c39d..004a977 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -97,6 +97,7 @@ static HRESULT WINAPI folders_QueryInterface(ITaskFolderCollection *iface, REFII } FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } @@ -354,6 +355,7 @@ static HRESULT WINAPI enumvar_QueryInterface(IEnumVARIANT *iface, REFIID riid, v } FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; } diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 09fe32a..97bb5f8 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -81,6 +81,7 @@ static HRESULT WINAPI TaskService_QueryInterface(ITaskService *iface, REFIID rii } FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + *obj = NULL; return E_NOINTERFACE; }

1 0

Dmitry Timoshkov : taskschd: Add IRegisteredTaskCollection stub implementation.
by Alexandre Julliard 06 Feb '14

06 Feb '14

Module: wine Branch: master Commit: 2201d7b0c1659b28b8a6b89e581e0df5def55132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2201d7b0c1659b28b8a6b89e5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 5 15:10:00 2014 +0900 taskschd: Add IRegisteredTaskCollection stub implementation. --- dlls/taskschd/folder.c | 9 ++- dlls/taskschd/regtask.c | 129 ++++++++++++++++++++++++++++++++++++++ dlls/taskschd/taskschd_private.h | 1 + 3 files changed, 137 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index fd516d6..c5f8010 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -298,8 +298,13 @@ static HRESULT WINAPI TaskFolder_GetTask(ITaskFolder *iface, BSTR path, IRegiste static HRESULT WINAPI TaskFolder_GetTasks(ITaskFolder *iface, LONG flags, IRegisteredTaskCollection **tasks) { - FIXME("%p,%x,%p: stub\n", iface, flags, tasks); - return E_NOTIMPL; + TaskFolder *folder = impl_from_ITaskFolder(iface); + + TRACE("%p,%x,%p: stub\n", iface, flags, tasks); + + if (!tasks) return E_POINTER; + + return RegisteredTaskCollection_create(folder->path, tasks); } static HRESULT WINAPI TaskFolder_DeleteTask(ITaskFolder *iface, BSTR name, LONG flags) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index c0a35a3..5252670 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -267,3 +267,132 @@ HRESULT RegisteredTask_create(const WCHAR *path, IRegisteredTask **obj) return S_OK; } + +typedef struct +{ + IRegisteredTaskCollection IRegisteredTaskCollection_iface; + LONG ref; + WCHAR *path; +} RegisteredTaskCollection; + +static inline RegisteredTaskCollection *impl_from_IRegisteredTaskCollection(IRegisteredTaskCollection *iface) +{ + return CONTAINING_RECORD(iface, RegisteredTaskCollection, IRegisteredTaskCollection_iface); +} + +static ULONG WINAPI regtasks_AddRef(IRegisteredTaskCollection *iface) +{ + RegisteredTaskCollection *regtasks = impl_from_IRegisteredTaskCollection(iface); + return InterlockedIncrement(&regtasks->ref); +} + +static ULONG WINAPI regtasks_Release(IRegisteredTaskCollection *iface) +{ + RegisteredTaskCollection *regtasks = impl_from_IRegisteredTaskCollection(iface); + LONG ref = InterlockedDecrement(&regtasks->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + heap_free(regtasks->path); + heap_free(regtasks); + } + + return ref; +} + +static HRESULT WINAPI regtasks_QueryInterface(IRegisteredTaskCollection *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_IRegisteredTaskCollection) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IRegisteredTaskCollection_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static HRESULT WINAPI regtasks_GetTypeInfoCount(IRegisteredTaskCollection *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtasks_GetTypeInfo(IRegisteredTaskCollection *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtasks_GetIDsOfNames(IRegisteredTaskCollection *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 regtasks_Invoke(IRegisteredTaskCollection *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 regtasks_get_Count(IRegisteredTaskCollection *iface, LONG *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtasks_get_Item(IRegisteredTaskCollection *iface, VARIANT index, IRegisteredTask **regtask) +{ + FIXME("%p,%s,%p: stub\n", iface, debugstr_variant(&index), regtask); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtasks_get__NewEnum(IRegisteredTaskCollection *iface, IUnknown **penum) +{ + FIXME("%p,%p: stub\n", iface, penum); + return E_NOTIMPL; +} + +static const IRegisteredTaskCollectionVtbl RegisteredTaskCollection_vtbl = +{ + regtasks_QueryInterface, + regtasks_AddRef, + regtasks_Release, + regtasks_GetTypeInfoCount, + regtasks_GetTypeInfo, + regtasks_GetIDsOfNames, + regtasks_Invoke, + regtasks_get_Count, + regtasks_get_Item, + regtasks_get__NewEnum +}; + +HRESULT RegisteredTaskCollection_create(const WCHAR *path, IRegisteredTaskCollection **obj) +{ + RegisteredTaskCollection *regtasks; + + regtasks = heap_alloc(sizeof(*regtasks)); + if (!regtasks) return E_OUTOFMEMORY; + + regtasks->IRegisteredTaskCollection_iface.lpVtbl = &RegisteredTaskCollection_vtbl; + regtasks->ref = 1; + regtasks->path = heap_strdupW(path); + *obj = &regtasks->IRegisteredTaskCollection_iface; + + TRACE("created %p\n", *obj); + + return S_OK; +} diff --git a/dlls/taskschd/taskschd_private.h b/dlls/taskschd/taskschd_private.h index b1f5ff9..df15903 100644 --- a/dlls/taskschd/taskschd_private.h +++ b/dlls/taskschd/taskschd_private.h @@ -22,6 +22,7 @@ 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; HRESULT RegisteredTask_create(const WCHAR *path, IRegisteredTask **obj) DECLSPEC_HIDDEN; +HRESULT RegisteredTaskCollection_create(const WCHAR *path, IRegisteredTaskCollection **obj) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT *v) DECLSPEC_HIDDEN;

1 0

Dmitry Timoshkov : taskschd: Add ITaskDefinition stub implementation.
by Alexandre Julliard 06 Feb '14

06 Feb '14

Module: wine Branch: master Commit: 4248b1405df5bb9fb828440757d5483aa4e3f990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4248b1405df5bb9fb82844075… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 5 15:10:54 2014 +0900 taskschd: Add ITaskDefinition stub implementation. --- dlls/taskschd/task.c | 218 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 216 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 97bb5f8..b465266 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -34,6 +34,209 @@ WINE_DEFAULT_DEBUG_CHANNEL(taskschd); typedef struct { + ITaskDefinition ITaskDefinition_iface; + LONG ref; +} TaskDefinition; + +static inline TaskDefinition *impl_from_ITaskDefinition(ITaskDefinition *iface) +{ + return CONTAINING_RECORD(iface, TaskDefinition, ITaskDefinition_iface); +} + +static ULONG WINAPI TaskDefinition_AddRef(ITaskDefinition *iface) +{ + TaskDefinition *taskdef = impl_from_ITaskDefinition(iface); + return InterlockedIncrement(&taskdef->ref); +} + +static ULONG WINAPI TaskDefinition_Release(ITaskDefinition *iface) +{ + TaskDefinition *taskdef = impl_from_ITaskDefinition(iface); + LONG ref = InterlockedDecrement(&taskdef->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + heap_free(taskdef); + } + + return ref; +} + +static HRESULT WINAPI TaskDefinition_QueryInterface(ITaskDefinition *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_ITaskDefinition) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + ITaskDefinition_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static HRESULT WINAPI TaskDefinition_GetTypeInfoCount(ITaskDefinition *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_GetTypeInfo(ITaskDefinition *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_GetIDsOfNames(ITaskDefinition *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 TaskDefinition_Invoke(ITaskDefinition *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 TaskDefinition_get_RegistrationInfo(ITaskDefinition *iface, IRegistrationInfo **info) +{ + FIXME("%p,%p: stub\n", iface, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_put_RegistrationInfo(ITaskDefinition *iface, IRegistrationInfo *info) +{ + FIXME("%p,%p: stub\n", iface, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_get_Triggers(ITaskDefinition *iface, ITriggerCollection **triggers) +{ + FIXME("%p,%p: stub\n", iface, triggers); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_put_Triggers(ITaskDefinition *iface, ITriggerCollection *triggers) +{ + FIXME("%p,%p: stub\n", iface, triggers); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_get_Settings(ITaskDefinition *iface, ITaskSettings **settings) +{ + FIXME("%p,%p: stub\n", iface, settings); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_put_Settings(ITaskDefinition *iface, ITaskSettings *settings) +{ + FIXME("%p,%p: stub\n", iface, settings); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_get_Data(ITaskDefinition *iface, BSTR *data) +{ + FIXME("%p,%p: stub\n", iface, data); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_put_Data(ITaskDefinition *iface, BSTR data) +{ + FIXME("%p,%p: stub\n", iface, data); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_get_Principal(ITaskDefinition *iface, IPrincipal **principal) +{ + FIXME("%p,%p: stub\n", iface, principal); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_put_Principal(ITaskDefinition *iface, IPrincipal *principal) +{ + FIXME("%p,%p: stub\n", iface, principal); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_get_Actions(ITaskDefinition *iface, IActionCollection **actions) +{ + FIXME("%p,%p: stub\n", iface, actions); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_put_Actions(ITaskDefinition *iface, IActionCollection *actions) +{ + FIXME("%p,%p: stub\n", iface, actions); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_get_XmlText(ITaskDefinition *iface, BSTR *xml) +{ + FIXME("%p,%p: stub\n", iface, xml); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_put_XmlText(ITaskDefinition *iface, BSTR xml) +{ + FIXME("%p,%p: stub\n", iface, xml); + return E_NOTIMPL; +} + +static const ITaskDefinitionVtbl TaskDefinition_vtbl = +{ + TaskDefinition_QueryInterface, + TaskDefinition_AddRef, + TaskDefinition_Release, + TaskDefinition_GetTypeInfoCount, + TaskDefinition_GetTypeInfo, + TaskDefinition_GetIDsOfNames, + TaskDefinition_Invoke, + TaskDefinition_get_RegistrationInfo, + TaskDefinition_put_RegistrationInfo, + TaskDefinition_get_Triggers, + TaskDefinition_put_Triggers, + TaskDefinition_get_Settings, + TaskDefinition_put_Settings, + TaskDefinition_get_Data, + TaskDefinition_put_Data, + TaskDefinition_get_Principal, + TaskDefinition_put_Principal, + TaskDefinition_get_Actions, + TaskDefinition_put_Actions, + TaskDefinition_get_XmlText, + TaskDefinition_put_XmlText +}; + +static HRESULT TaskDefinition_create(ITaskDefinition **obj) +{ + TaskDefinition *taskdef; + + taskdef = heap_alloc(sizeof(*taskdef)); + if (!taskdef) return E_OUTOFMEMORY; + + taskdef->ITaskDefinition_iface.lpVtbl = &TaskDefinition_vtbl; + taskdef->ref = 1; + *obj = &taskdef->ITaskDefinition_iface; + + TRACE("created %p\n", *obj); + + return S_OK; +} + +typedef struct +{ ITaskService ITaskService_iface; LONG ref; BOOL connected; @@ -134,8 +337,19 @@ static HRESULT WINAPI TaskService_GetRunningTasks(ITaskService *iface, LONG flag static HRESULT WINAPI TaskService_NewTask(ITaskService *iface, DWORD flags, ITaskDefinition **definition) { - FIXME("%p,%x,%p: stub\n", iface, flags, definition); - return E_NOTIMPL; + TaskService *task_svc = impl_from_ITaskService(iface); + + TRACE("%p,%x,%p\n", iface, flags, definition); + + if (!definition) return E_POINTER; + + if (!task_svc->connected) + return HRESULT_FROM_WIN32(ERROR_ONLY_IF_CONNECTED); + + if (flags) + FIXME("unsupported flags %x\n", flags); + + return TaskDefinition_create(definition); } static inline BOOL is_variant_null(const VARIANT *var)

1 0

Dmitry Timoshkov : scrrun/tests: Add more tests for IFileCollection using a dedicated temporary directory.
by Alexandre Julliard 06 Feb '14

06 Feb '14

Module: wine Branch: master Commit: 3a914b92fb742c39ccefb81c8854270f88414090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a914b92fb742c39ccefb81c8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 5 10:50:56 2014 +0900 scrrun/tests: Add more tests for IFileCollection using a dedicated temporary directory. --- dlls/scrrun/tests/filesystem.c | 172 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 167 insertions(+), 5 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index c764ae7..2b7118f 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1,6 +1,7 @@ /* * * Copyright 2012 Alistair Leslie-Hughes + * 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 @@ -784,6 +785,7 @@ static void test_GetFolder(void) IFolder_Release(folder); } +/* Please keep the tests for IFolderCollection and IFileCollection in sync */ static void test_FolderCollection(void) { static const WCHAR fooW[] = {'\\','f','o','o',0}; @@ -901,6 +903,8 @@ static void test_FolderCollection(void) found_b++; else if (!lstrcmpW(str, cW + 1)) found_c++; + else + ok(0, "unexpected folder %s was found\n", wine_dbgstr_w(str)); SysFreeString(str); IFolder_Release(folder); @@ -955,15 +959,31 @@ static void test_FolderCollection(void) IFolderCollection_Release(folders); } +/* Please keep the tests for IFolderCollection and IFileCollection in sync */ static void test_FileCollection(void) { - IFileCollection *files; - WCHAR buffW[MAX_PATH]; + static const WCHAR fooW[] = {'\\','f','o','o',0}; + static const WCHAR aW[] = {'\\','a',0}; + static const WCHAR bW[] = {'\\','b',0}; + static const WCHAR cW[] = {'\\','c',0}; + WCHAR buffW[MAX_PATH], pathW[MAX_PATH]; IFolder *folder; + IFileCollection *files; + IFile *file; + IEnumVARIANT *enumvar, *clone; + LONG count, ref, ref2, i; + IUnknown *unk, *unk2; + ULONG fetched; + VARIANT var, var2[2]; HRESULT hr; BSTR str; + HANDLE file_a, file_b, file_c; + int found_a = 0, found_b = 0, found_c = 0; - GetWindowsDirectoryW(buffW, MAX_PATH); + GetTempPathW(MAX_PATH, pathW); + GetTempFileNameW(pathW, fooW, 0, buffW); + DeleteFileW(buffW); + CreateDirectoryW(buffW, NULL); str = SysAllocString(buffW); hr = IFileSystem3_GetFolder(fs3, str, &folder); @@ -973,11 +993,153 @@ static void test_FileCollection(void) hr = IFolder_get_Files(folder, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); + lstrcpyW(pathW, buffW); + lstrcatW(pathW, aW); + file_a = CreateFileW(pathW, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_FLAG_DELETE_ON_CLOSE, 0); + lstrcpyW(pathW, buffW); + lstrcatW(pathW, bW); + file_b = CreateFileW(pathW, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_FLAG_DELETE_ON_CLOSE, 0); + hr = IFolder_get_Files(folder, &files); ok(hr == S_OK, "got 0x%08x\n", hr); - IFileCollection_Release(files); - IFolder_Release(folder); + + count = 0; + hr = IFileCollection_get_Count(files, &count); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(count == 2, "got %d\n", count); + + lstrcpyW(pathW, buffW); + lstrcatW(pathW, cW); + file_c = CreateFileW(pathW, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_FLAG_DELETE_ON_CLOSE, 0); + + /* every time property is requested it scans directory */ + count = 0; + hr = IFileCollection_get_Count(files, &count); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(count == 3, "got %d\n", count); + + hr = IFileCollection_get__NewEnum(files, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IFileCollection_QueryInterface(files, &IID_IEnumVARIANT, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + /* NewEnum creates new instance each time it's called */ + ref = GET_REFCOUNT(files); + + unk = NULL; + hr = IFileCollection_get__NewEnum(files, &unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ref2 = GET_REFCOUNT(files); + ok(ref2 == ref + 1, "got %d, %d\n", ref2, ref); + + unk2 = NULL; + hr = IFileCollection_get__NewEnum(files, &unk2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(unk != unk2, "got %p, %p\n", unk2, unk); + IUnknown_Release(unk2); + + /* now get IEnumVARIANT */ + ref = GET_REFCOUNT(files); + hr = IUnknown_QueryInterface(unk, &IID_IEnumVARIANT, (void**)&enumvar); + ok(hr == S_OK, "got 0x%08x\n", hr); + ref2 = GET_REFCOUNT(files); + ok(ref2 == ref, "got %d, %d\n", ref2, ref); + + /* clone enumerator */ + hr = IEnumVARIANT_Clone(enumvar, &clone); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(clone != enumvar, "got %p, %p\n", enumvar, clone); + IEnumVARIANT_Release(clone); + + hr = IEnumVARIANT_Reset(enumvar); + ok(hr == S_OK, "got 0x%08x\n", hr); + + for (i = 0; i < 3; i++) + { + VariantInit(&var); + fetched = 0; + hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); + ok(hr == S_OK, "%d: got 0x%08x\n", i, hr); + ok(fetched == 1, "%d: got %d\n", i, fetched); + ok(V_VT(&var) == VT_DISPATCH, "%d: got type %d\n", i, V_VT(&var)); + + hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IFile, (void **)&file); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = NULL; + hr = IFile_get_Name(file, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (!lstrcmpW(str, aW + 1)) + found_a++; + else if (!lstrcmpW(str, bW + 1)) + found_b++; + else if (!lstrcmpW(str, cW + 1)) + found_c++; + else + ok(0, "unexpected file %s was found\n", wine_dbgstr_w(str)); + SysFreeString(str); + + /* FIXME: uncomment once Wine is fixed + IFile_Release(file); */ + VariantClear(&var); + } + +todo_wine + ok(found_a == 1 && found_b == 1 && found_c == 1, + "each file should be found 1 time instead of %d/%d/%d\n", + found_a, found_b, found_c); + + VariantInit(&var); + fetched = -1; + hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); +todo_wine + ok(hr == S_FALSE, "got 0x%08x\n", hr); +todo_wine + ok(fetched == 0, "got %d\n", fetched); + + hr = IEnumVARIANT_Reset(enumvar); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IEnumVARIANT_Skip(enumvar, 2); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IEnumVARIANT_Skip(enumvar, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + + VariantInit(&var2[0]); + VariantInit(&var2[1]); + fetched = -1; + hr = IEnumVARIANT_Next(enumvar, 0, var2, &fetched); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fetched == 0, "got %d\n", fetched); + fetched = -1; + hr = IEnumVARIANT_Next(enumvar, 2, var2, &fetched); +todo_wine + ok(hr == S_FALSE, "got 0x%08x\n", hr); +todo_wine + ok(fetched == 1, "got %d\n", fetched); + ok(V_VT(&var2[0]) == VT_DISPATCH, "got type %d\n", V_VT(&var2[0])); + VariantClear(&var2[0]); + VariantClear(&var2[1]); + + IEnumVARIANT_Release(enumvar); + IUnknown_Release(unk); + + CloseHandle(file_a); + CloseHandle(file_b); + CloseHandle(file_c); + RemoveDirectoryW(buffW); + + IFileCollection_Release(files); } START_TEST(filesystem)

1 0

Jacek Caban : wmp: Added IPersistStreamInit stub implementation.
by Alexandre Julliard 06 Feb '14

06 Feb '14

Module: wine Branch: master Commit: 28a1eaedc9626e35f5b23188534e75afcdd0bc35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28a1eaedc9626e35f5b231885… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 6 11:38:09 2014 +0100 wmp: Added IPersistStreamInit stub implementation. --- dlls/wmp/oleobj.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wmp/tests/oleobj.c | 17 +++++++++ 2 files changed, 106 insertions(+) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 79a21ca..380ae1f 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -25,6 +25,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmp); struct WindowsMediaPlayer { IOleObject IOleObject_iface; IProvideClassInfo2 IProvideClassInfo2_iface; + IPersistStreamInit IPersistStreamInit_iface; + LONG ref; }; @@ -49,6 +51,12 @@ static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, v }else if(IsEqualGUID(riid, &IID_IProvideClassInfo2)) { TRACE("(%p)->(IID_IProvideClassInfo2 %p)\n", This, ppv); *ppv = &This->IProvideClassInfo2_iface; + }else if(IsEqualGUID(riid, &IID_IPersist)) { + TRACE("(%p)->(IID_IPersist %p)\n", This, ppv); + *ppv = &This->IPersistStreamInit_iface; + }else if(IsEqualGUID(riid, &IID_IPersistStreamInit)) { + TRACE("(%p)->(IID_IPersistStreamInit %p)\n", This, ppv); + *ppv = &This->IPersistStreamInit_iface; }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -311,6 +319,86 @@ static const IProvideClassInfo2Vtbl ProvideClassInfo2Vtbl = { ProvideClassInfo2_GetGUID }; +static inline WindowsMediaPlayer *impl_from_IPersistStreamInit(IPersistStreamInit *iface) +{ + return CONTAINING_RECORD(iface, WindowsMediaPlayer, IPersistStreamInit_iface); +} + +static HRESULT WINAPI PersistStreamInit_QueryInterface(IPersistStreamInit *iface, + REFIID riid, void **ppv) +{ + WindowsMediaPlayer *This = impl_from_IPersistStreamInit(iface); + return IOleObject_QueryInterface(&This->IOleObject_iface, riid, ppv); +} + +static ULONG WINAPI PersistStreamInit_AddRef(IPersistStreamInit *iface) +{ + WindowsMediaPlayer *This = impl_from_IPersistStreamInit(iface); + return IOleObject_AddRef(&This->IOleObject_iface); +} + +static ULONG WINAPI PersistStreamInit_Release(IPersistStreamInit *iface) +{ + WindowsMediaPlayer *This = impl_from_IPersistStreamInit(iface); + return IOleObject_Release(&This->IOleObject_iface); +} + +static HRESULT WINAPI PersistStreamInit_GetClassID(IPersistStreamInit *iface, CLSID *pClassID) +{ + WindowsMediaPlayer *This = impl_from_IPersistStreamInit(iface); + FIXME("(%p)->(%p)\n", This, pClassID); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_IsDirty(IPersistStreamInit *iface) +{ + WindowsMediaPlayer *This = impl_from_IPersistStreamInit(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM pStm) +{ + WindowsMediaPlayer *This = impl_from_IPersistStreamInit(iface); + FIXME("(%p)->(%p)\n", This, pStm); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, LPSTREAM pStm, + BOOL fClearDirty) +{ + WindowsMediaPlayer *This = impl_from_IPersistStreamInit(iface); + FIXME("(%p)->(%p %x)\n", This, pStm, fClearDirty); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_GetSizeMax(IPersistStreamInit *iface, + ULARGE_INTEGER *pcbSize) +{ + WindowsMediaPlayer *This = impl_from_IPersistStreamInit(iface); + FIXME("(%p)->(%p)\n", This, pcbSize); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) +{ + WindowsMediaPlayer *This = impl_from_IPersistStreamInit(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static const IPersistStreamInitVtbl PersistStreamInitVtbl = { + PersistStreamInit_QueryInterface, + PersistStreamInit_AddRef, + PersistStreamInit_Release, + PersistStreamInit_GetClassID, + PersistStreamInit_IsDirty, + PersistStreamInit_Load, + PersistStreamInit_Save, + PersistStreamInit_GetSizeMax, + PersistStreamInit_InitNew +}; + HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { @@ -325,6 +413,7 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, wmp->IOleObject_iface.lpVtbl = &OleObjectVtbl; wmp->IProvideClassInfo2_iface.lpVtbl = &ProvideClassInfo2Vtbl; + wmp->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; wmp->ref = 1; diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 45dea43..3f105f4 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -24,9 +24,19 @@ #include "wine/test.h" +static void test_QI(IUnknown *unk) +{ + IUnknown *tmp; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IQuickActivate, (void**)&tmp); + ok(hres == E_NOINTERFACE, "Got IQuickActivate iface when no expected\n"); +} + static void test_wmp(void) { IProvideClassInfo2 *class_info; + IPersistStreamInit *psi; IOleObject *oleobj; GUID guid; LONG ref; @@ -48,6 +58,13 @@ static void test_wmp(void) IProvideClassInfo2_Release(class_info); + test_QI((IUnknown*)oleobj); + + hres = IOleObject_QueryInterface(oleobj, &IID_IPersistStreamInit, (void**)&psi); + ok(hres == S_OK, "Could not get IPersistStreamInit iface: %08x\n", hres); + + IPersistStreamInit_Release(psi); + ref = IOleObject_Release(oleobj); ok(!ref, "ref = %d\n", ref); }

1 0

Jacek Caban : msctf.idl: Added ITfActiveLanguageProfileNotifySink declaration.
by Alexandre Julliard 06 Feb '14

06 Feb '14

Module: wine Branch: master Commit: 531c2b398e2b8d0ce9cc6ca8c1fa0aec0311d4e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=531c2b398e2b8d0ce9cc6ca8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 6 12:11:48 2014 +0100 msctf.idl: Added ITfActiveLanguageProfileNotifySink declaration. --- include/msctf.idl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/msctf.idl b/include/msctf.idl index e4b54e4..68e2dc1 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -738,6 +738,19 @@ interface ITfContextOwnerCompositionSink : IUnknown }; [ + object, + uuid(b246cb75-a93e-4652-bf8c-b3fe0cfd7e57), + pointer_default(unique) +] +interface ITfActiveLanguageProfileNotifySink : IUnknown +{ + HRESULT OnActivated( + [in] REFCLSID clsid, + [in] REFGUID guidProfile, + [in] BOOL fActivated); +} + +[ object, uuid(3d61bf11-ac5f-42c8-a4cb-931bcc28c744), pointer_default(unique)

1 0

Dmitry Timoshkov : server: Fix generic access mapping for a process.
by Alexandre Julliard 06 Feb '14

06 Feb '14

Module: wine Branch: master Commit: 53847fd6a1b78e16a9591992bad051c9b6431bf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53847fd6a1b78e16a9591992b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 6 20:47:29 2014 +0900 server: Fix generic access mapping for a process. --- dlls/advapi32/tests/security.c | 2 -- server/process.c | 7 ++++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 87f3ea93..6225529 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5053,12 +5053,10 @@ static void test_process_access(void) switch (map[i].generic) { case GENERIC_READ: -todo_wine ok(access == map[i].mapped || access == (map[i].mapped | PROCESS_QUERY_LIMITED_INFORMATION) /* Vista+ */, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; case GENERIC_WRITE: -todo_wine ok(access == map[i].mapped || access == (map[i].mapped | PROCESS_TERMINATE) /* before Vista */, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; diff --git a/server/process.c b/server/process.c index 4a73662..41b5eca 100644 --- a/server/process.c +++ b/server/process.c @@ -448,9 +448,10 @@ static int process_signaled( struct object *obj, struct wait_queue_entry *entry static unsigned int process_map_access( struct object *obj, unsigned int access ) { - if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYNCHRONIZE; - if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | SYNCHRONIZE; - if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | PROCESS_QUERY_INFORMATION | PROCESS_VM_READ; + if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | PROCESS_SET_QUOTA | PROCESS_SET_INFORMATION | PROCESS_SUSPEND_RESUME | + PROCESS_VM_WRITE | PROCESS_DUP_HANDLE | PROCESS_CREATE_PROCESS | PROCESS_CREATE_THREAD | PROCESS_VM_OPERATION; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | PROCESS_TERMINATE; if (access & GENERIC_ALL) access |= PROCESS_ALL_ACCESS; return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); }

1 0

Alexandre Julliard : tools: Move sfnt2fnt to its own directory.
by Alexandre Julliard 06 Feb '14

06 Feb '14

Module: wine Branch: master Commit: 7307e2be69db349ec98f75a91308e608da22e260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7307e2be69db349ec98f75a91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 6 10:44:47 2014 +0100 tools: Move sfnt2fnt to its own directory. Also rename to sfnt2fon to better reflect usage and avoid conflicts with the previous binary on updates. --- Make.vars.in | 1 - Makefile.in | 6 +++--- configure | 1 + configure.ac | 1 + tools/Makefile.in | 12 ++---------- tools/makedep.c | 4 ++-- tools/sfnt2fon/Makefile.in | 9 +++++++++ tools/{sfnt2fnt.c => sfnt2fon/sfnt2fon.c} | 2 +- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index a0727bd..684d673 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -50,7 +50,6 @@ CROSSTARGET = @CROSSTARGET@ LINGUAS = @LINGUAS@ RUNTESTFLAGS = -q -P wine MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT) -SFNT2FNT = $(TOOLSDIR)/tools/sfnt2fnt$(TOOLSEXT) WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild$(TOOLSEXT) WRC = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT) LIBPORT = $(top_builddir)/libs/port/libwine_port.a diff --git a/Makefile.in b/Makefile.in index 8d4dec4..5c163b8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -53,11 +53,11 @@ __builddeps__: __tooldeps__ include .PHONY: depend check test testclean crosstest __tooldeps__ __builddeps__ loader server: libs/port libs/wine tools -fonts: tools +fonts: tools/sfnt2fon include: tools tools/widl -libs/wine: libs/port +libs/wine tools: libs/port tools/wmc tools/wrc: tools -tools tools/wmc tools/wrc: libs/wine +tools/sfnt2fon tools/wmc tools/wrc: libs/wine tools/widl tools/wmc tools/wrc: libs/wpp libs/port libs/wine libs/wpp: include/config.h diff --git a/configure b/configure index 8c3e28e..d2c416e 100755 --- a/configure +++ b/configure @@ -17331,6 +17331,7 @@ wine_fn_config_program xcopy enable_xcopy install,po wine_fn_config_test programs/xcopy/tests xcopy.exe_test wine_fn_config_makefile server enable_server clean,install-lib,manpage wine_fn_config_tool tools clean,install-dev,install-lib,manpage +wine_fn_config_tool tools/sfnt2fon clean wine_fn_config_tool tools/widl clean,install-dev,manpage wine_fn_config_tool tools/winebuild clean,install-dev,manpage wine_fn_config_tool tools/winedump clean,install-dev,manpage diff --git a/configure.ac b/configure.ac index c6769fc..de6c687 100644 --- a/configure.ac +++ b/configure.ac @@ -3356,6 +3356,7 @@ WINE_CONFIG_PROGRAM(xcopy,,[install,po]) WINE_CONFIG_TEST(programs/xcopy/tests) WINE_CONFIG_MAKEFILE([server],,[clean,install-lib,manpage]) WINE_CONFIG_TOOL(tools,[clean,install-dev,install-lib,manpage]) +WINE_CONFIG_TOOL(tools/sfnt2fon,[clean]) WINE_CONFIG_TOOL(tools/widl,[clean,install-dev,manpage]) WINE_CONFIG_TOOL(tools/winebuild,[clean,install-dev,manpage]) WINE_CONFIG_TOOL(tools/winedump,[clean,install-dev,manpage]) diff --git a/tools/Makefile.in b/tools/Makefile.in index a7cc154..582b140 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,11 +1,7 @@ -EXTRAINCL = $(FREETYPE_CFLAGS) -FREETYPELIBS = $(FREETYPE_LIBS) - PROGRAMS = \ fnt2fon$(EXEEXT) \ make_ctests$(EXEEXT) \ - make_xftmpl$(EXEEXT) \ - sfnt2fnt$(EXEEXT) + make_xftmpl$(EXEEXT) MANPAGES = \ winemaker.de.UTF-8.man.in \ @@ -16,8 +12,7 @@ C_SRCS = \ fnt2fon.c \ make_ctests.c \ make_xftmpl.c \ - makedep.c \ - sfnt2fnt.c + makedep.c IN_SRCS = \ wineapploader.in @@ -35,9 +30,6 @@ make_xftmpl$(EXEEXT): make_xftmpl.o fnt2fon$(EXEEXT): fnt2fon.o $(CC) $(CFLAGS) -o $@ fnt2fon.o $(LIBPORT) $(LDFLAGS) -sfnt2fnt$(EXEEXT): sfnt2fnt.o - $(CC) $(CFLAGS) -o $@ sfnt2fnt.o $(LIBWINE_STATIC) $(LIBPORT) $(LDFLAGS) $(FREETYPELIBS) - .PHONY: install install-lib install-dev uninstall install install-lib:: diff --git a/tools/makedep.c b/tools/makedep.c index 8ce9da0..11c921c 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1655,9 +1655,9 @@ static struct strarray output_sources(void) else if (!strcmp( ext, "fon" )) /* bitmap font file */ { strarray_add( &all_targets, source->name ); - output( "%s.fon: %s %s\n", obj, tools_dir_path( "sfnt2fnt" ), + output( "%s.fon: %s %s\n", obj, tools_path( "sfnt2fon" ), src_dir_path( source->sourcename )); - output( "\t%s -o $@ %s %s\n", tools_dir_path( "sfnt2fnt" ), + output( "\t%s -o $@ %s %s\n", tools_path( "sfnt2fon" ), src_dir_path( source->sourcename ), source->args ); output( "install install-lib:: %s\n", source->name ); output( "\t$(INSTALL_DATA) %s $(DESTDIR)$(fontdir)/%s\n", source->name, source->name ); diff --git a/tools/sfnt2fon/Makefile.in b/tools/sfnt2fon/Makefile.in new file mode 100644 index 0000000..a975154 --- /dev/null +++ b/tools/sfnt2fon/Makefile.in @@ -0,0 +1,9 @@ +PROGRAMS = sfnt2fon$(EXEEXT) + +C_SRCS = sfnt2fon.c + +EXTRAINCL = $(FREETYPE_CFLAGS) +EXTRALIBS = $(FREETYPE_LIBS) + +sfnt2fon$(EXEEXT): sfnt2fon.o + $(CC) $(CFLAGS) -o $@ sfnt2fon.o $(LIBWINE_STATIC) $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fon/sfnt2fon.c similarity index 99% rename from tools/sfnt2fnt.c rename to tools/sfnt2fon/sfnt2fon.c index 925855f..4b47682 100644 --- a/tools/sfnt2fnt.c +++ b/tools/sfnt2fon/sfnt2fon.c @@ -1,5 +1,5 @@ /* - * sfnttofnt. Bitmap only ttf to Window fnt file converter + * sfnt2fon. Bitmap-only ttf to Windows font file converter * * Copyright 2004 Huw Davies *

1 0