wine-devel March 2018

wine-devel@winehq.org

90 participants
798 discussions

[RFC 0/2] Cleaning up DXTn support patches in Staging
by Kyle Devir 30 Mar '18

30 Mar '18

This is my first stab at helping a FOSS project, in a middle of a rough spot in life, so please don't mind my awkward wordiness. :) libtxc_dxtn has now been depreciated due to the functionality now being merged into Mesa a while ago now. Some distros, including Arch, have completely removed the library in response to this. Given that adding proper DXTn support without libtxc_dxtn feels out of my league for now, I thought I might as well clean up the useless code, and additionally add the needed code from Mesa in a file called dxtn.h. In Mesa, the code is also in header file, used by internal Mesa functions. I'm not sure just yet how to turn this into something that just uses GL more directly, but that'll be a something I'll be starting to research soon. For now, this minor cleanup might be suitable for Staging, but eventually, I plan to get this into mainline, which will need to be a lot tidier than it currently is. Throw any suggestions at me that you think will help. :) Kyle Devir (2): wined3d: implement DXTn compression support d3dx9_36: implement DXTn compression support dlls/d3dx9_24/Makefile.in | 2 +- dlls/d3dx9_25/Makefile.in | 2 +- dlls/d3dx9_26/Makefile.in | 2 +- dlls/d3dx9_27/Makefile.in | 2 +- dlls/d3dx9_28/Makefile.in | 2 +- dlls/d3dx9_29/Makefile.in | 2 +- dlls/d3dx9_30/Makefile.in | 2 +- dlls/d3dx9_31/Makefile.in | 2 +- dlls/d3dx9_32/Makefile.in | 2 +- dlls/d3dx9_33/Makefile.in | 2 +- dlls/d3dx9_34/Makefile.in | 2 +- dlls/d3dx9_35/Makefile.in | 2 +- dlls/d3dx9_36/Makefile.in | 2 +- dlls/d3dx9_36/surface.c | 100 ++++- dlls/d3dx9_36/tests/surface.c | 8 +- dlls/d3dx9_37/Makefile.in | 2 +- dlls/d3dx9_38/Makefile.in | 2 +- dlls/d3dx9_39/Makefile.in | 2 +- dlls/d3dx9_40/Makefile.in | 2 +- dlls/d3dx9_41/Makefile.in | 2 +- dlls/d3dx9_42/Makefile.in | 2 +- dlls/d3dx9_43/Makefile.in | 2 +- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/dxtn.c | 435 +++++++++++++++++++ dlls/wined3d/dxtn.h | 987 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/surface.c | 153 +++++++ dlls/wined3d/wined3d.spec | 7 + dlls/wined3d/wined3d_main.c | 1 + include/wine/wined3d.h | 13 + 29 files changed, 1714 insertions(+), 31 deletions(-) create mode 100644 dlls/wined3d/dxtn.c create mode 100644 dlls/wined3d/dxtn.h -- 2.16.3

1 2

[PATCH] comctl32/button: Improve button data layout compatibility
by Nikolay Sivov 30 Mar '18

30 Mar '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- For https://bugs.winehq.org/show_bug.cgi?id=44857 dlls/comctl32/button.c | 2 ++ dlls/comctl32/tests/button.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 8b5a654efc..7d48fe7956 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -90,6 +90,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(button); typedef struct _BUTTON_INFO { HWND hwnd; + HWND parent; LONG state; HFONT font; WCHAR *note; @@ -342,6 +343,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L infoPtr = heap_alloc_zero( sizeof(*infoPtr) ); SetWindowLongPtrW( hWnd, 0, (LONG_PTR)infoPtr ); infoPtr->hwnd = hWnd; + infoPtr->parent = GetParent(hWnd); return DefWindowProcW(hWnd, uMsg, wParam, lParam); case WM_NCDESTROY: diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 4c07f0adcd..0aacfa5888 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -979,6 +979,62 @@ static void register_parent_class(void) RegisterClassA(&cls); } +static void test_button_data(void) +{ + static const DWORD styles[] = + { + BS_PUSHBUTTON, + BS_DEFPUSHBUTTON, + BS_CHECKBOX, + BS_AUTOCHECKBOX, + BS_RADIOBUTTON, + BS_3STATE, + BS_AUTO3STATE, + BS_GROUPBOX, + BS_USERBUTTON, + BS_AUTORADIOBUTTON, + BS_OWNERDRAW, + BS_SPLITBUTTON, + BS_DEFSPLITBUTTON, + BS_COMMANDLINK, + BS_DEFCOMMANDLINK, + }; + + struct button_desc + { + HWND self; + HWND parent; + }; + unsigned int i; + HWND parent; + + parent = CreateWindowExA(0, "TestParentClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(parent != 0, "Failed to create parent window\n"); + + for (i = 0; i < ARRAY_SIZE(styles); i++) + { + struct button_desc *desc; + HWND hwnd; + + hwnd = create_button(styles[i], parent); + ok(hwnd != NULL, "Failed to create a button.\n"); + + desc = (void *)GetWindowLongPtrA(hwnd, 0); + ok(desc != NULL, "Expected window data.\n"); + + if (desc) + { + ok(desc->self == hwnd, "Unexpected 'self' field.\n"); + ok(desc->parent == parent, "Unexpected 'parent' field.\n"); + } + + DestroyWindow(hwnd); + } + + DestroyWindow(parent); +} + START_TEST(button) { ULONG_PTR ctx_cookie; @@ -995,6 +1051,7 @@ START_TEST(button) test_button_class(); test_button_messages(); test_note(); + test_button_data(); unload_v6_module(ctx_cookie, hCtx); } -- 2.16.2

1 0

[PATCH] testbot/web: Grab the last 12 hours of activity by default.
by Francois Gouget 30 Mar '18

30 Mar '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- 12 hours is probably sufficient in most cases and the rest of the time a higher value can be specified. testbot/web/Activity.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 96a1ef0a7..08e0291ae 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -33,7 +33,7 @@ use WineTestBot::VMs; @ActivityPage::ISA = qw(ObjectModel::CGI::FreeFormPage); -my $HOURS_DEFAULT = 24; +my $HOURS_DEFAULT = 12; sub _initialize($$$) { -- 2.16.2

1 0

[PATCH] testbot: Fix Collection::IsEmpty() on perl 5.20.
by Francois Gouget 30 Mar '18

30 Mar '18

Although scalar(%hash) is 0 when the hash is empty, the rest of the time it is not a number. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Collection.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index a57a32942..032c7386d 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -420,8 +420,9 @@ sub IsEmpty($) } # Even though scalar(hash) does not return the number of items in Perl 5.20 - # it returns 0 for an empty hash. - return !$self->{Items} || scalar(%{$self->{Items}}) == 0; + # (and cannot generally be compared to numbers), it evaluates to true for + # all hashes except empty ones. + return !$self->{Items} || !%{$self->{Items}}; } sub CombineKey($@) -- 2.16.2

1 0

[PATCH 8/8] mstask: Implement setting and getting a task comment using IExecAction.
by Dmitry Timoshkov 30 Mar '18

30 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 64 +++++++++++++++++++++--------------------------------- 1 file changed, 25 insertions(+), 39 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index ed0b984d84..5a4023694c 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -39,7 +39,6 @@ typedef struct ITaskDefinition *task; IExecAction *action; LPWSTR task_name; - LPWSTR comment; DWORD maxRunTime; LPWSTR accountName; } TaskImpl; @@ -62,7 +61,6 @@ static void TaskDestructor(TaskImpl *This) ITaskDefinition_Release(This->task); HeapFree(GetProcessHeap(), 0, This->task_name); HeapFree(GetProcessHeap(), 0, This->accountName); - HeapFree(GetProcessHeap(), 0, This->comment); HeapFree(GetProcessHeap(), 0, This); InterlockedDecrement(&dll_ref); } @@ -247,56 +245,45 @@ static HRESULT WINAPI MSTASK_ITask_GetExitCode( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_SetComment( - ITask* iface, - LPCWSTR pwszComment) +static HRESULT WINAPI MSTASK_ITask_SetComment(ITask *iface, LPCWSTR comment) { - DWORD n; TaskImpl *This = impl_from_ITask(iface); - LPWSTR tmp_comment; - TRACE("(%p, %s)\n", iface, debugstr_w(pwszComment)); + TRACE("(%p, %s)\n", iface, debugstr_w(comment)); - /* Empty comment */ - if (pwszComment[0] == 0) - { - HeapFree(GetProcessHeap(), 0, This->comment); - This->comment = NULL; - return S_OK; - } + if (!comment || !comment[0]) + comment = NULL; - /* Set to pwszComment */ - n = (lstrlenW(pwszComment) + 1); - tmp_comment = HeapAlloc(GetProcessHeap(), 0, n * sizeof(WCHAR)); - if (!tmp_comment) - return E_OUTOFMEMORY; - lstrcpyW(tmp_comment, pwszComment); - HeapFree(GetProcessHeap(), 0, This->comment); - This->comment = tmp_comment; - - return S_OK; + return IExecAction_put_Id(This->action, (BSTR)comment); } -static HRESULT WINAPI MSTASK_ITask_GetComment( - ITask* iface, - LPWSTR *ppwszComment) +static HRESULT WINAPI MSTASK_ITask_GetComment(ITask *iface, LPWSTR *comment) { - DWORD n; TaskImpl *This = impl_from_ITask(iface); + HRESULT hr; + BSTR id; + DWORD len; - TRACE("(%p, %p)\n", iface, ppwszComment); + TRACE("(%p, %p)\n", iface, comment); - n = This->comment ? lstrlenW(This->comment) + 1 : 1; - *ppwszComment = CoTaskMemAlloc(n * sizeof(WCHAR)); - if (!*ppwszComment) - return E_OUTOFMEMORY; + hr = IExecAction_get_Id(This->action, &id); + if (hr != S_OK) return hr; - if (!This->comment) - *ppwszComment[0] = 0; + len = id ? lstrlenW(id) + 1 : 1; + *comment = CoTaskMemAlloc(len * sizeof(WCHAR)); + if (*comment) + { + if (!id) + *comment[0] = 0; + else + lstrcpyW(*comment, id); + hr = S_OK; + } else - lstrcpyW(*ppwszComment, This->comment); + hr = E_OUTOFMEMORY; - return S_OK; + SysFreeString(id); + return hr; } static HRESULT WINAPI MSTASK_ITask_SetCreator( @@ -798,7 +785,6 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **t This->ref = 1; This->task = taskdef; This->task_name = heap_strdupW(task_name); - This->comment = NULL; This->accountName = NULL; /* Default time is 3 days = 259200000 ms */ -- 2.16.2

1 0

[PATCH 7/8] mstask: Implement setting and getting working directory using IExecAction.
by Dmitry Timoshkov 30 Mar '18

30 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 1aba435efd..ed0b984d84 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -533,20 +533,45 @@ static HRESULT WINAPI MSTASK_ITask_GetParameters(ITask *iface, LPWSTR *params) return hr; } -static HRESULT WINAPI MSTASK_ITask_SetWorkingDirectory( - ITask* iface, - LPCWSTR pwszWorkingDirectory) +static HRESULT WINAPI MSTASK_ITask_SetWorkingDirectory(ITask * iface, LPCWSTR workdir) { - FIXME("(%p, %s): stub\n", iface, debugstr_w(pwszWorkingDirectory)); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p, %s)\n", iface, debugstr_w(workdir)); + + if (!workdir || !workdir[0]) + workdir = NULL; + + return IExecAction_put_WorkingDirectory(This->action, (BSTR)workdir); } -static HRESULT WINAPI MSTASK_ITask_GetWorkingDirectory( - ITask* iface, - LPWSTR *ppwszWorkingDirectory) +static HRESULT WINAPI MSTASK_ITask_GetWorkingDirectory(ITask *iface, LPWSTR *workdir) { - FIXME("(%p, %p): stub\n", iface, ppwszWorkingDirectory); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + HRESULT hr; + BSTR dir; + DWORD len; + + TRACE("(%p, %p)\n", iface, workdir); + + hr = IExecAction_get_WorkingDirectory(This->action, &dir); + if (hr != S_OK) return hr; + + len = dir ? lstrlenW(dir) + 1 : 1; + *workdir = CoTaskMemAlloc(len * sizeof(WCHAR)); + if (*workdir) + { + if (!dir) + *workdir[0] = 0; + else + lstrcpyW(*workdir, dir); + hr = S_OK; + } + else + hr = E_OUTOFMEMORY; + + SysFreeString(dir); + return hr; } static HRESULT WINAPI MSTASK_ITask_SetPriority( -- 2.16.2

1 0

[PATCH 6/8] mstask: Implement setting and getting parameters using IExecAction.
by Dmitry Timoshkov 30 Mar '18

30 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 62 ++++++++++++++++++++++-------------------------------- 1 file changed, 25 insertions(+), 37 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 1a079cc8c5..1aba435efd 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -39,7 +39,6 @@ typedef struct ITaskDefinition *task; IExecAction *action; LPWSTR task_name; - LPWSTR parameters; LPWSTR comment; DWORD maxRunTime; LPWSTR accountName; @@ -64,7 +63,6 @@ static void TaskDestructor(TaskImpl *This) HeapFree(GetProcessHeap(), 0, This->task_name); HeapFree(GetProcessHeap(), 0, This->accountName); HeapFree(GetProcessHeap(), 0, This->comment); - HeapFree(GetProcessHeap(), 0, This->parameters); HeapFree(GetProcessHeap(), 0, This); InterlockedDecrement(&dll_ref); } @@ -493,55 +491,46 @@ static HRESULT WINAPI MSTASK_ITask_GetApplicationName(ITask *iface, LPWSTR *appn return hr; } -static HRESULT WINAPI MSTASK_ITask_SetParameters( - ITask* iface, - LPCWSTR pwszParameters) +static HRESULT WINAPI MSTASK_ITask_SetParameters(ITask *iface, LPCWSTR params) { - DWORD n; TaskImpl *This = impl_from_ITask(iface); - LPWSTR tmp_parameters; - TRACE("(%p, %s)\n", iface, debugstr_w(pwszParameters)); + TRACE("(%p, %s)\n", iface, debugstr_w(params)); /* Empty parameter list */ - if (pwszParameters[0] == 0) - { - HeapFree(GetProcessHeap(), 0, This->parameters); - This->parameters = NULL; - return S_OK; - } + if (!params || !params[0]) + params = NULL; - /* Set to pwszParameters */ - n = (lstrlenW(pwszParameters) + 1); - tmp_parameters = HeapAlloc(GetProcessHeap(), 0, n * sizeof(WCHAR)); - if (!tmp_parameters) - return E_OUTOFMEMORY; - lstrcpyW(tmp_parameters, pwszParameters); - HeapFree(GetProcessHeap(), 0, This->parameters); - This->parameters = tmp_parameters; - return S_OK; + return IExecAction_put_Arguments(This->action, (BSTR)params); } -static HRESULT WINAPI MSTASK_ITask_GetParameters( - ITask* iface, - LPWSTR *ppwszParameters) +static HRESULT WINAPI MSTASK_ITask_GetParameters(ITask *iface, LPWSTR *params) { - DWORD n; TaskImpl *This = impl_from_ITask(iface); + HRESULT hr; + BSTR args; + DWORD len; - TRACE("(%p, %p)\n", iface, ppwszParameters); + TRACE("(%p, %p)\n", iface, params); - n = This->parameters ? lstrlenW(This->parameters) + 1 : 1; - *ppwszParameters = CoTaskMemAlloc(n * sizeof(WCHAR)); - if (!*ppwszParameters) - return E_OUTOFMEMORY; + hr = IExecAction_get_Arguments(This->action, &args); + if (hr != S_OK) return hr; - if (!This->parameters) - *ppwszParameters[0] = 0; + len = args ? lstrlenW(args) + 1 : 1; + *params = CoTaskMemAlloc(len * sizeof(WCHAR)); + if (*params) + { + if (!args) + *params[0] = 0; + else + lstrcpyW(*params, args); + hr = S_OK; + } else - lstrcpyW(*ppwszParameters, This->parameters); + hr = E_OUTOFMEMORY; - return S_OK; + SysFreeString(args); + return hr; } static HRESULT WINAPI MSTASK_ITask_SetWorkingDirectory( @@ -784,7 +773,6 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **t This->ref = 1; This->task = taskdef; This->task_name = heap_strdupW(task_name); - This->parameters = NULL; This->comment = NULL; This->accountName = NULL; -- 2.16.2

1 0

[PATCH 5/8] mstask: Implement setting and getting an application name using IExecAction.
by Dmitry Timoshkov 30 Mar '18

30 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 110 +++++++++++++++++++++++++++++------------------------ 1 file changed, 60 insertions(+), 50 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 97d778255f..1a079cc8c5 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -37,8 +37,8 @@ typedef struct IPersistFile IPersistFile_iface; LONG ref; ITaskDefinition *task; + IExecAction *action; LPWSTR task_name; - LPWSTR applicationName; LPWSTR parameters; LPWSTR comment; DWORD maxRunTime; @@ -58,6 +58,8 @@ static inline TaskImpl *impl_from_IPersistFile( IPersistFile *iface ) static void TaskDestructor(TaskImpl *This) { TRACE("%p\n", This); + if (This->action) + IExecAction_Release(This->action); ITaskDefinition_Release(This->task); HeapFree(GetProcessHeap(), 0, This->task_name); HeapFree(GetProcessHeap(), 0, This->accountName); @@ -427,73 +429,68 @@ static HRESULT WINAPI MSTASK_ITask_GetAccountInformation( return S_OK; } -static HRESULT WINAPI MSTASK_ITask_SetApplicationName( - ITask* iface, - LPCWSTR pwszApplicationName) +static HRESULT WINAPI MSTASK_ITask_SetApplicationName(ITask *iface, LPCWSTR appname) { - DWORD n; TaskImpl *This = impl_from_ITask(iface); - LPWSTR tmp_name; + DWORD len; - TRACE("(%p, %s)\n", iface, debugstr_w(pwszApplicationName)); + TRACE("(%p, %s)\n", iface, debugstr_w(appname)); /* Empty application name */ - if (pwszApplicationName[0] == 0) - { - HeapFree(GetProcessHeap(), 0, This->applicationName); - This->applicationName = NULL; - return S_OK; - } + if (!appname || !appname[0]) + return IExecAction_put_Path(This->action, NULL); /* Attempt to set pwszApplicationName to a path resolved application name */ - n = SearchPathW(NULL, pwszApplicationName, NULL, 0, NULL, NULL); - if (n) + len = SearchPathW(NULL, appname, NULL, 0, NULL, NULL); + if (len) { - tmp_name = HeapAlloc(GetProcessHeap(), 0, n * sizeof(WCHAR)); + LPWSTR tmp_name; + HRESULT hr; + + tmp_name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!tmp_name) return E_OUTOFMEMORY; - n = SearchPathW(NULL, pwszApplicationName, NULL, n, tmp_name, NULL); - if (n) - { - HeapFree(GetProcessHeap(), 0, This->applicationName); - This->applicationName = tmp_name; - return S_OK; - } + len = SearchPathW(NULL, appname, NULL, len, tmp_name, NULL); + if (len) + hr = IExecAction_put_Path(This->action, tmp_name); else - HeapFree(GetProcessHeap(), 0, tmp_name); + hr = HRESULT_FROM_WIN32(GetLastError()); + + HeapFree(GetProcessHeap(), 0, tmp_name); + return hr; } - /* If unable to path resolve name, simply set to pwszApplicationName */ - n = (lstrlenW(pwszApplicationName) + 1); - tmp_name = HeapAlloc(GetProcessHeap(), 0, n * sizeof(WCHAR)); - if (!tmp_name) - return E_OUTOFMEMORY; - lstrcpyW(tmp_name, pwszApplicationName); - HeapFree(GetProcessHeap(), 0, This->applicationName); - This->applicationName = tmp_name; - return S_OK; + /* If unable to path resolve name, simply set to appname */ + return IExecAction_put_Path(This->action, (BSTR)appname); } -static HRESULT WINAPI MSTASK_ITask_GetApplicationName( - ITask* iface, - LPWSTR *ppwszApplicationName) +static HRESULT WINAPI MSTASK_ITask_GetApplicationName(ITask *iface, LPWSTR *appname) { - DWORD n; TaskImpl *This = impl_from_ITask(iface); + HRESULT hr; + BSTR path; + DWORD len; - TRACE("(%p, %p)\n", iface, ppwszApplicationName); + TRACE("(%p, %p)\n", iface, appname); - n = This->applicationName ? lstrlenW(This->applicationName) + 1 : 1; - *ppwszApplicationName = CoTaskMemAlloc(n * sizeof(WCHAR)); - if (!*ppwszApplicationName) - return E_OUTOFMEMORY; + hr = IExecAction_get_Path(This->action, &path); + if (hr != S_OK) return hr; - if (!This->applicationName) - *ppwszApplicationName[0] = 0; + len = path ? lstrlenW(path) + 1 : 1; + *appname = CoTaskMemAlloc(len * sizeof(WCHAR)); + if (*appname) + { + if (!path) + *appname[0] = 0; + else + lstrcpyW(*appname, path); + hr = S_OK; + } else - lstrcpyW(*ppwszApplicationName, This->applicationName); + hr = E_OUTOFMEMORY; - return S_OK; + SysFreeString(path); + return hr; } static HRESULT WINAPI MSTASK_ITask_SetParameters( @@ -767,6 +764,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **t { TaskImpl *This; ITaskDefinition *taskdef; + IActionCollection *actions; HRESULT hr; TRACE("(%s, %p)\n", debugstr_w(task_name), task); @@ -786,7 +784,6 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **t This->ref = 1; This->task = taskdef; This->task_name = heap_strdupW(task_name); - This->applicationName = NULL; This->parameters = NULL; This->comment = NULL; This->accountName = NULL; @@ -794,7 +791,20 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **t /* Default time is 3 days = 259200000 ms */ This->maxRunTime = 259200000; - *task = &This->ITask_iface; - InterlockedIncrement(&dll_ref); - return S_OK; + hr = ITaskDefinition_get_Actions(This->task, &actions); + if (hr == S_OK) + { + hr = IActionCollection_Create(actions, TASK_ACTION_EXEC, (IAction **)&This->action); + IActionCollection_Release(actions); + if (hr == S_OK) + { + *task = &This->ITask_iface; + InterlockedIncrement(&dll_ref); + return S_OK; + } + } + + ITaskDefinition_Release(This->task); + ITask_Release(&This->ITask_iface); + return hr; } -- 2.16.2

1 0

[PATCH 4/8] mstask/tests: Add some tests for task file storage.
by Dmitry Timoshkov 30 Mar '18

30 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/tests/task_scheduler.c | 151 +++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index 31d284819c..e1e76e8c9c 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -2,6 +2,7 @@ * Test suite for TaskScheduler interface * * Copyright (C) 2008 Google (Roy Shea) + * Copyright (C) 2018 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -231,9 +232,159 @@ if (0) { /* crashes on win2k */ ITaskScheduler_Release(scheduler); } +static BOOL file_exists(const WCHAR *name) +{ + return GetFileAttributesW(name) != INVALID_FILE_ATTRIBUTES; +} + +static void test_save_task_curfile(ITask *task) +{ + HRESULT hr; + IPersistFile *pfile; + WCHAR *curfile; + + hr = ITask_QueryInterface(task, &IID_IPersistFile, (void **)&pfile); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + curfile = NULL; + hr = IPersistFile_GetCurFile(pfile, &curfile); + ok(hr == S_OK, "GetCurFile error %#x\n", hr); + ok(curfile && curfile[0] , "curfile should not be NULL\n"); + + ok(file_exists(curfile), "curfile should exist\n"); + + hr = IPersistFile_Save(pfile, curfile, FALSE); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#x\n", hr); + + hr = IPersistFile_Save(pfile, curfile, TRUE); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#x\n", hr); + + hr = IPersistFile_Save(pfile, NULL, FALSE); + ok(hr == S_OK, "Save error %#x\n", hr); + + hr = IPersistFile_Save(pfile, NULL, TRUE); + ok(hr == S_OK, "Save error %#x\n", hr); + + curfile = NULL; + hr = IPersistFile_GetCurFile(pfile, &curfile); + ok(hr == S_OK, "GetCurFile error %#x\n", hr); + ok(curfile && curfile[0] , "curfile should not be NULL\n"); + + IPersistFile_Release(pfile); +} + +static WCHAR *get_task_curfile(ITask *task) +{ + HRESULT hr; + IPersistFile *pfile; + WCHAR *curfile; + + hr = ITask_QueryInterface(task, &IID_IPersistFile, (void **)&pfile); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + curfile = NULL; + hr = IPersistFile_GetCurFile(pfile, &curfile); +todo_wine + ok(hr == S_OK, "GetCurFile error %#x\n", hr); +todo_wine + ok(curfile && curfile[0] , "curfile should not be NULL\n"); + + IPersistFile_Release(pfile); + + return curfile; +} + +static void test_task_storage(void) +{ + static const WCHAR Task1[] = { 'w','i','n','e','t','a','s','k',0 }; + static const WCHAR Task1_job[] = { '\\','T','a','s','k','s','\\','w','i','n','e','t','a','s','k','.','j','o','b',0 }; + WCHAR task_full_name[MAX_PATH]; + HRESULT hr; + ITaskScheduler *scheduler; + ITask *task, *task2; + WCHAR *curfile, *curfile2; + + GetWindowsDirectoryW(task_full_name, MAX_PATH); + lstrcatW(task_full_name, Task1_job); + + hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskScheduler, (void **)&scheduler); + if (hr != S_OK) + { + win_skip("CoCreateInstance(CLSID_CTaskScheduler) error %#x\n", hr); + return; + } + + hr = ITaskScheduler_NewWorkItem(scheduler, Task1, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "NewWorkItem error %#x\n", hr); + + curfile = get_task_curfile(task); + ok(!file_exists(curfile), "curfile should not exist\n"); +todo_wine + ok(!lstrcmpW(curfile, task_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); + + hr = ITaskScheduler_NewWorkItem(scheduler, Task1, &CLSID_CTask, &IID_ITask, (IUnknown **)&task2); + ok(hr == S_OK, "NewWorkItem error %#x\n", hr); + ok(task2 != task, "tasks should not be equal\n"); + + curfile2 = get_task_curfile(task); + ok(!file_exists(curfile2), "curfile2 should not exist\n"); +todo_wine + ok(!lstrcmpW(curfile2, task_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile2)); + + CoTaskMemFree(curfile); + CoTaskMemFree(curfile2); + + task2 = (ITask *)0xdeadbeef; + hr = ITaskScheduler_Activate(scheduler, Task1, &IID_ITask, (IUnknown **)&task2); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "wrong error %#x\n", hr); + ok(task2 == (ITask *)0xdeadbeef, "task should not be set to NULL\n"); + + hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); +todo_wine + ok(hr == S_OK, "AddWorkItem error %#x\n", hr); + + curfile = get_task_curfile(task); +todo_wine + ok(file_exists(curfile), "curfile should exist\n"); + + hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); +todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#x\n", hr); + + curfile = get_task_curfile(task); +todo_wine + ok(file_exists(curfile), "curfile should exist\n"); + + ITask_Release(task); + + task = NULL; + hr = ITaskScheduler_Activate(scheduler, Task1, &IID_ITask, (IUnknown **)&task); +todo_wine + ok(hr == S_OK, "Activate error %#x\n", hr); +todo_wine + ok(task != NULL, "task should not be set to NULL\n"); + if (task == NULL) goto fail; + + curfile2 = get_task_curfile(task); + ok(file_exists(curfile2), "curfile2 should exist\n"); + ok(!lstrcmpW(curfile2, task_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile2)); + + CoTaskMemFree(curfile2); + + test_save_task_curfile(task); + + DeleteFileW(curfile); + CoTaskMemFree(curfile); + + ITask_Release(task); +fail: + ITaskScheduler_Release(scheduler); +} + START_TEST(task_scheduler) { CoInitialize(NULL); + + test_task_storage(); test_NewWorkItem(); test_Activate(); test_GetTargetComputer(); -- 2.16.2

1 0

[PATCH 3/8] mstask: Improve stubs for ITask::GetTaskFlags and ITask::GetFlags.
by Dmitry Timoshkov 30 Mar '18

30 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 18 ++++++++---------- dlls/mstask/tests/task.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 10 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index e77a959e0f..97d778255f 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -373,12 +373,11 @@ static HRESULT WINAPI MSTASK_ITask_SetFlags( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_GetFlags( - ITask* iface, - DWORD *pdwFlags) +static HRESULT WINAPI MSTASK_ITask_GetFlags(ITask *iface, DWORD *flags) { - FIXME("(%p, %p): stub\n", iface, pdwFlags); - return E_NOTIMPL; + FIXME("(%p, %p): stub\n", iface, flags); + *flags = 0; + return S_OK; } static HRESULT WINAPI MSTASK_ITask_SetAccountInformation( @@ -588,12 +587,11 @@ static HRESULT WINAPI MSTASK_ITask_SetTaskFlags( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_GetTaskFlags( - ITask* iface, - DWORD *pdwFlags) +static HRESULT WINAPI MSTASK_ITask_GetTaskFlags(ITask *iface, DWORD *flags) { - FIXME("(%p, %p): stub\n", iface, pdwFlags); - return E_NOTIMPL; + FIXME("(%p, %p): stub\n", iface, flags); + *flags = 0; + return S_OK; } static HRESULT WINAPI MSTASK_ITask_SetMaxRunTime( diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index d139207039..956aa0bbd0 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -496,6 +496,39 @@ static void test_SetAccountInformation_GetAccountInformation(void) return; } +static void test_GetFlags(void) +{ + BOOL setup; + HRESULT hr; + DWORD flags; + + setup = setup_task(); + ok(setup, "Failed to setup test_task\n"); + if (!setup) + { + skip("Failed to create task. Skipping tests.\n"); + return; + } + + if (0) /* crashes under Windows */ + hr = ITask_GetFlags(test_task, NULL); + + flags = 0xdeadbeef; + hr = ITask_GetFlags(test_task, &flags); + ok(hr == S_OK, "GetFlags error %#x\n", hr); + ok(flags == 0, "got %#x\n", flags); + + if (0) /* crashes under Windows */ + hr = ITask_GetTaskFlags(test_task, NULL); + + flags = 0xdeadbeef; + hr = ITask_GetTaskFlags(test_task, &flags); + ok(hr == S_OK, "GetTaskFlags error %#x\n", hr); + ok(flags == 0, "got %#x\n", flags); + + cleanup_task(); +} + START_TEST(task) { CoInitialize(NULL); @@ -505,5 +538,6 @@ START_TEST(task) test_SetComment_GetComment(); test_SetMaxRunTime_GetMaxRunTime(); test_SetAccountInformation_GetAccountInformation(); + test_GetFlags(); CoUninitialize(); } -- 2.16.2

1 0

← Newer
1
2
3
4
5
6
7
8
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel March 2018