April 2018 - Wine-Commits - list.winehq.org

Jacek Caban : d3d11.idl: Fixed a typo in CD3D11_BLEND_DESC constructor.
by Alexandre Julliard April 23, 2018

April 23, 2018

Module: wine Branch: master Commit: 51c9aaf58499ff59c1f46f6f728dd384e54821a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51c9aaf58499ff59c1f46f6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 20 17:32:58 2018 +0200 d3d11.idl: Fixed a typo in CD3D11_BLEND_DESC constructor. Spotted by Tom Ritter. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/d3d11.idl b/include/d3d11.idl index b4cc3be..78b4f33 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -1371,7 +1371,9 @@ cpp_quote(" explicit CD3D11_BLEND_DESC(const D3D11_BLEND_DESC &o) : D3D11_BLE cpp_quote(" explicit CD3D11_BLEND_DESC(CD3D11_DEFAULT) {") cpp_quote(" AlphaToCoverageEnable = FALSE;") cpp_quote(" IndependentBlendEnable = FALSE;") -cpp_quote(" for(D3D11_RENDER_TARGET_BLEND_DESC *target; target < RenderTarget+D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; target++) {") +cpp_quote(" for(D3D11_RENDER_TARGET_BLEND_DESC *target = RenderTarget;") +cpp_quote(" target < RenderTarget + D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT;") +cpp_quote(" target++) {") cpp_quote(" target->BlendEnable = FALSE;") cpp_quote(" target->SrcBlend = target->SrcBlendAlpha = D3D11_BLEND_ONE;") cpp_quote(" target->DestBlend = target->DestBlendAlpha = D3D11_BLEND_ZERO;")

1 0

Alexandre Julliard : testbot: Add a missing return.
by Alexandre Julliard April 22, 2018

April 22, 2018

Module: tools Branch: master Commit: adb48711595d68dd02ed1009420f572a6a552c52 URL: https://source.winehq.org/git/tools.git/?a=commit;h=adb48711595d68dd02ed100… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Apr 22 10:10:22 2018 +0200 testbot: Add a missing return. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index ec1b450..88ecf85 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -519,7 +519,7 @@ sub SaveItem($$) { die "Internal error: Need to save new items via collection"; } - if (!$Item->GetIsModified()); + return if (!$Item->GetIsModified()); my ($MasterColNames, $MasterColValues) = $Item->GetMasterCols(); my $Query = $self->BuildUpdateStatement($Item->GetTableName(),

1 0

Francois Gouget : Revert "testbot/web: Tweak ItemPage to save the Item directly.".
by Alexandre Julliard April 22, 2018

April 22, 2018

Module: tools Branch: master Commit: ed4208e634b2fa21d3a8d3580882976bb31f51d0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ed4208e634b2fa21d3a8d35… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Apr 21 19:56:52 2018 +0200 Revert "testbot/web: Tweak ItemPage to save the Item directly.". Saving the item directly is ok when modifying it, but DBIBackend only supports saving new items through the collection. In particular the registration web page depends on that so we have no choice but to go through the collection. This reverts commit c18379abe004411ca779d4c42e26d7e7f3d72ba6. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index c208aea..9b9f2ff 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -134,16 +134,6 @@ sub SaveProperty($$$) return 1; } -sub Save($) -{ - my ($self) = @_; - - return !1 if (!$self->SaveProperties()); - - ($self->{ErrField}, $self->{ErrMessage}) = $self->{Item}->Save(); - return ! defined($self->{ErrMessage}); -} - sub OnAction($$) { my ($self, $Action) = @_;

1 0

Francois Gouget : testbot: Import Utils in Log for DurationToString().
by Alexandre Julliard April 22, 2018

April 22, 2018

Module: tools Branch: master Commit: 942f6853c3a4628e35389bc951aa909c29c5c098 URL: https://source.winehq.org/git/tools.git/?a=commit;h=942f6853c3a4628e35389bc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Apr 21 19:57:16 2018 +0200 testbot: Import Utils in Log for DurationToString(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Log.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index 36efb48..2876b99 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -109,7 +109,8 @@ sub Elapsed($) sub PrettyElapsed($) { my ($Start) = @_; - return DurationToString(Time()-$Start); + require WineTestBot::Utils; + return WineTestBot::Utils::DurationToString(Time()-$Start); } 1;

1 0

Francois Gouget : testbot: Check $Item->{IsNew} before $Item-> {IsModified}.
by Alexandre Julliard April 22, 2018

April 22, 2018

Module: tools Branch: master Commit: 50477068bc2a067180f1484bd923d2b6e972f8f4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=50477068bc2a067180f1484… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Apr 21 20:02:58 2018 +0200 testbot: Check $Item->{IsNew} before $Item->{IsModified}. After creating a new item one normally modifies a number of fields. So check whether the item is new before assuming we simply need to update it just because IsModified is true. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 40bfe85..ec1b450 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -515,26 +515,18 @@ sub SaveItem($$) { my ($self, $Item) = @_; - my $Query; - my ($MasterColNames, $MasterColValues) = $Item->GetMasterCols(); - if ($Item->GetIsModified()) - { - $Query = $self->BuildUpdateStatement($Item->GetTableName(), - $Item->GetPropertyDescriptors(), - $MasterColNames); - } - elsif ($Item->GetIsNew()) + if ($Item->GetIsNew()) { die "Internal error: Need to save new items via collection"; } - else - { - return; - } + if (!$Item->GetIsModified()); + my ($MasterColNames, $MasterColValues) = $Item->GetMasterCols(); + my $Query = $self->BuildUpdateStatement($Item->GetTableName(), + $Item->GetPropertyDescriptors(), + $MasterColNames); my $Statement = $self->GetDb()->prepare($Query); $Statement->execute(@{$self->GetUpdateData($MasterColValues, $Item)}); - $Statement->finish(); }

1 0

Dmitry Timoshkov : mstask: Implement ITask::GetIdleWait().
by Alexandre Julliard April 20, 2018

April 20, 2018

Module: wine Branch: master Commit: d08a101a283cf00f24bcc3ae99211cd90d3e597b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d08a101a283cf00f24bcc3ae… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 20 16:37:18 2018 +0800 mstask: Implement ITask::GetIdleWait(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 17 +++++++++++------ dlls/mstask/tests/task.c | 12 +++++++++++- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 3f68afb..c2cd14e 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -40,6 +40,7 @@ typedef struct IExecAction *action; LPWSTR task_name; HRESULT status; + WORD idle_minutes, deadline_minutes; DWORD maxRunTime; LPWSTR accountName; } TaskImpl; @@ -190,13 +191,15 @@ static HRESULT WINAPI MSTASK_ITask_SetIdleWait( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_GetIdleWait( - ITask* iface, - WORD *pwIdleMinutes, - WORD *pwDeadlineMinutes) +static HRESULT WINAPI MSTASK_ITask_GetIdleWait(ITask *iface, WORD *idle_minutes, WORD *deadline_minutes) { - FIXME("(%p, %p, %p): stub\n", iface, pwIdleMinutes, pwDeadlineMinutes); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p, %p, %p): stub\n", iface, idle_minutes, deadline_minutes); + + *idle_minutes = This->idle_minutes; + *deadline_minutes = This->deadline_minutes; + return S_OK; } static HRESULT WINAPI MSTASK_ITask_Run( @@ -840,6 +843,8 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **t This->task = taskdef; This->task_name = heap_strdupW(task_name); This->status = SCHED_S_TASK_NOT_SCHEDULED; + This->idle_minutes = 10; + This->deadline_minutes = 60; This->accountName = NULL; /* Default time is 3 days = 259200000 ms */ diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 5256424..55e4913 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -502,7 +502,7 @@ static void test_task_state(void) BOOL setup; HRESULT hr, status; DWORD flags; - WORD val1; + WORD val1, val2; setup = setup_task(); ok(setup, "Failed to setup test_task\n"); @@ -547,6 +547,16 @@ static void test_task_state(void) hr = ITask_GetErrorRetryInterval(test_task, &val1); ok(hr == E_NOTIMPL, "got %#x\n", hr); + if (0) /* crashes under Windows */ + hr = ITask_GetIdleWait(test_task, NULL, NULL); + + val1 = 0xdead; + val2 = 0xbeef; + hr = ITask_GetIdleWait(test_task, &val1, &val2); + ok(hr == S_OK, "got %#x\n", hr); + ok(val1 == 10, "got %u\n", val1); + ok(val2 == 60, "got %u\n", val2); + cleanup_task(); }

1 0

Dmitry Timoshkov : mstask: ITask::GetErrorRetryCount() is not implemented.
by Alexandre Julliard April 20, 2018

April 20, 2018

Module: wine Branch: master Commit: a933e2e0406f9806e067715ed4f985efa6a55f53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a933e2e0406f9806e067715e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 20 16:37:12 2018 +0800 mstask: ITask::GetErrorRetryCount() is not implemented. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 6 ++---- dlls/mstask/tests/task.c | 7 +++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index d144f98..26cefcd 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -386,11 +386,9 @@ static HRESULT WINAPI MSTASK_ITask_SetErrorRetryCount( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_GetErrorRetryCount( - ITask* iface, - WORD *pwRetryCount) +static HRESULT WINAPI MSTASK_ITask_GetErrorRetryCount(ITask *iface, WORD *count) { - FIXME("(%p, %p): stub\n", iface, pwRetryCount); + TRACE("(%p, %p)\n", iface, count); return E_NOTIMPL; } diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index cc855be..3739db0 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -502,6 +502,7 @@ static void test_task_state(void) BOOL setup; HRESULT hr, status; DWORD flags; + WORD val1; setup = setup_task(); ok(setup, "Failed to setup test_task\n"); @@ -534,6 +535,12 @@ static void test_task_state(void) hr = ITask_GetStatus(test_task, &status); ok(status == SCHED_S_TASK_NOT_SCHEDULED, "got %#x\n", status); + if (0) /* crashes under Windows */ + hr = ITask_GetErrorRetryCount(test_task, NULL); + + hr = ITask_GetErrorRetryCount(test_task, &val1); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + cleanup_task(); }

1 0

Dmitry Timoshkov : mstask: Implement ITask::GetStatus().
by Alexandre Julliard April 20, 2018

April 20, 2018

Module: wine Branch: master Commit: 5907782d59300acc641ec32b81e211673ceecc19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5907782d59300acc641ec32b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 20 16:37:08 2018 +0800 mstask: Implement ITask::GetStatus(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 14 +++++++++----- dlls/mstask/tests/task.c | 14 +++++++++++--- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index c4e9f84..d144f98 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -39,6 +39,7 @@ typedef struct ITaskDefinition *task; IExecAction *action; LPWSTR task_name; + HRESULT status; DWORD maxRunTime; LPWSTR accountName; } TaskImpl; @@ -229,12 +230,14 @@ static HRESULT WINAPI MSTASK_ITask_GetMostRecentRunTime( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_GetStatus( - ITask* iface, - HRESULT *phrStatus) +static HRESULT WINAPI MSTASK_ITask_GetStatus(ITask *iface, HRESULT *status) { - FIXME("(%p, %p): stub\n", iface, phrStatus); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p, %p)\n", iface, status); + + *status = This->status; + return S_OK; } static HRESULT WINAPI MSTASK_ITask_GetExitCode( @@ -840,6 +843,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **t This->ref = 1; This->task = taskdef; This->task_name = heap_strdupW(task_name); + This->status = SCHED_S_TASK_NOT_SCHEDULED; This->accountName = NULL; /* Default time is 3 days = 259200000 ms */ diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 956aa0b..cc855be 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -2,6 +2,7 @@ * Test suite for Task 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 @@ -496,10 +497,10 @@ static void test_SetAccountInformation_GetAccountInformation(void) return; } -static void test_GetFlags(void) +static void test_task_state(void) { BOOL setup; - HRESULT hr; + HRESULT hr, status; DWORD flags; setup = setup_task(); @@ -526,6 +527,13 @@ static void test_GetFlags(void) ok(hr == S_OK, "GetTaskFlags error %#x\n", hr); ok(flags == 0, "got %#x\n", flags); + if (0) /* crashes under Windows */ + hr = ITask_GetStatus(test_task, NULL); + + status = 0xdeadbeef; + hr = ITask_GetStatus(test_task, &status); + ok(status == SCHED_S_TASK_NOT_SCHEDULED, "got %#x\n", status); + cleanup_task(); } @@ -538,6 +546,6 @@ START_TEST(task) test_SetComment_GetComment(); test_SetMaxRunTime_GetMaxRunTime(); test_SetAccountInformation_GetAccountInformation(); - test_GetFlags(); + test_task_state(); CoUninitialize(); }

1 0

Dmitry Timoshkov : mstask: Implement IPersistFile::GetClassID().
by Alexandre Julliard April 20, 2018

April 20, 2018

Module: wine Branch: master Commit: cbe3300b1e5de9b535dcecbc22ec4ebb76f35afe URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbe3300b1e5de9b535dcecbc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 20 16:37:04 2018 +0800 mstask: Implement IPersistFile::GetClassID(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 10 +++++----- dlls/mstask/tests/task_scheduler.c | 8 ++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 34d1fa0..c4e9f84 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -703,12 +703,12 @@ static ULONG WINAPI MSTASK_IPersistFile_Release( return ref; } -static HRESULT WINAPI MSTASK_IPersistFile_GetClassID( - IPersistFile* iface, - CLSID *pClassID) +static HRESULT WINAPI MSTASK_IPersistFile_GetClassID(IPersistFile *iface, CLSID *clsid) { - FIXME("(%p, %p): stub\n", iface, pClassID); - return E_NOTIMPL; + TRACE("(%p, %p)\n", iface, clsid); + + *clsid = CLSID_CTask; + return S_OK; } static HRESULT WINAPI MSTASK_IPersistFile_IsDirty( diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index e1e76e8..ddbb660 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -278,6 +278,7 @@ static WCHAR *get_task_curfile(ITask *task) HRESULT hr; IPersistFile *pfile; WCHAR *curfile; + CLSID clsid; hr = ITask_QueryInterface(task, &IID_IPersistFile, (void **)&pfile); ok(hr == S_OK, "QueryInterface error %#x\n", hr); @@ -288,6 +289,13 @@ todo_wine todo_wine ok(curfile && curfile[0] , "curfile should not be NULL\n"); + if (0) /* crashes under Windows */ + hr = IPersistFile_GetClassID(pfile, NULL); + + hr = IPersistFile_GetClassID(pfile, &clsid); + ok(hr == S_OK, "GetClassID error %#x\n", hr); + ok(IsEqualCLSID(&clsid, &CLSID_CTask), "got %s\n", wine_dbgstr_guid(&clsid)); + IPersistFile_Release(pfile); return curfile;

1 0

Alexandre Julliard : joy.cpl: Add a 256x256 icon.
by Alexandre Julliard April 20, 2018

April 20, 2018

Module: wine Branch: master Commit: 80a19b613f3b314d85d43140a8cf4e684bdf45a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80a19b613f3b314d85d43140… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 20 17:17:17 2018 +0200 joy.cpl: Add a 256x256 icon. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/joy.ico | Bin 25214 -> 54079 bytes dlls/joy.cpl/joy.svg | 2156 ++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 1898 insertions(+), 258 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=80a19b613f3b314d85d4…

1 0