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

Józef Kucia : wined3d: Introduce helper function to get shader type from byte code.
by Alexandre Julliard 23 Apr '18

23 Apr '18

Module: wine Branch: master Commit: 319abecc41d36e9c4d31ec9bf463b1d7ac4aa51e URL: https://source.winehq.org/git/wine.git/?a=commit;h=319abecc41d36e9c4d31ec9b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 23 16:20:14 2018 +0200 wined3d: Introduce helper function to get shader type from byte code. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 24 +++++++++++++++ dlls/wined3d/shader_sm4.c | 69 +++++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 4 +++ 3 files changed, 70 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index c20c1da..8934c4f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -419,6 +419,15 @@ static const struct wined3d_shader_frontend *shader_select_frontend(enum wined3d } } +static enum wined3d_shader_type shader_get_shader_type(const struct wined3d_shader_desc *desc) +{ + if (desc->format == WINED3D_SHADER_BYTE_CODE_FORMAT_SM4) + return wined3d_get_sm4_shader_type(desc->byte_code, desc->byte_code_size); + + FIXME("Could not get shader type for byte code format %#x.\n", desc->format); + return WINED3D_SHADER_TYPE_INVALID; +} + void string_buffer_clear(struct wined3d_string_buffer *buffer) { buffer->buffer[0] = '\0'; @@ -3722,8 +3731,23 @@ static HRESULT geometry_shader_init(struct wined3d_shader *shader, struct wined3 void *parent, const struct wined3d_parent_ops *parent_ops) { struct wined3d_stream_output_element *elements = NULL; + enum wined3d_shader_type shader_type; HRESULT hr; + if (so_desc) + { + shader_type = shader_get_shader_type(desc); + switch (shader_type) + { + case WINED3D_SHADER_TYPE_VERTEX: + case WINED3D_SHADER_TYPE_DOMAIN: + FIXME("Stream output not supported for %s.\n", debug_shader_type(shader_type)); + return E_NOTIMPL; + default: + break; + } + } + if (so_desc && !(elements = heap_calloc(so_desc->element_count, sizeof(*elements)))) return E_OUTOFMEMORY; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 8eac746..f11af76 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1218,6 +1218,43 @@ static enum wined3d_data_type map_data_type(char t) } } +enum wined3d_shader_type wined3d_get_sm4_shader_type(const DWORD *byte_code, size_t byte_code_size) +{ + DWORD shader_type; + + if (byte_code_size / sizeof(*byte_code) < 1) + { + WARN("Invalid byte code size %lu.\n", (long)byte_code_size); + return WINED3D_SHADER_TYPE_INVALID; + } + + shader_type = byte_code[0] >> 16; + switch (shader_type) + { + case WINED3D_SM4_PS: + return WINED3D_SHADER_TYPE_PIXEL; + break; + case WINED3D_SM4_VS: + return WINED3D_SHADER_TYPE_VERTEX; + break; + case WINED3D_SM4_GS: + return WINED3D_SHADER_TYPE_GEOMETRY; + break; + case WINED3D_SM5_HS: + return WINED3D_SHADER_TYPE_HULL; + break; + case WINED3D_SM5_DS: + return WINED3D_SHADER_TYPE_DOMAIN; + break; + case WINED3D_SM5_CS: + return WINED3D_SHADER_TYPE_COMPUTE; + break; + default: + FIXME("Unrecognised shader type %#x.\n", shader_type); + return WINED3D_SHADER_TYPE_INVALID; + } +} + static void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, const struct wined3d_shader_signature *output_signature) { @@ -1251,35 +1288,13 @@ static void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, priv->start = &byte_code[2]; priv->end = &byte_code[token_count]; - switch (version_token >> 16) + priv->shader_version.type = wined3d_get_sm4_shader_type(byte_code, byte_code_size); + if (priv->shader_version.type == WINED3D_SHADER_TYPE_INVALID) { - case WINED3D_SM4_PS: - priv->shader_version.type = WINED3D_SHADER_TYPE_PIXEL; - break; - - case WINED3D_SM4_VS: - priv->shader_version.type = WINED3D_SHADER_TYPE_VERTEX; - break; - - case WINED3D_SM4_GS: - priv->shader_version.type = WINED3D_SHADER_TYPE_GEOMETRY; - break; - - case WINED3D_SM5_HS: - priv->shader_version.type = WINED3D_SHADER_TYPE_HULL; - break; - - case WINED3D_SM5_DS: - priv->shader_version.type = WINED3D_SHADER_TYPE_DOMAIN; - break; - - case WINED3D_SM5_CS: - priv->shader_version.type = WINED3D_SHADER_TYPE_COMPUTE; - break; - - default: - FIXME("Unrecognised shader type %#x.\n", version_token >> 16); + heap_free(priv); + return NULL; } + priv->shader_version.major = WINED3D_SM4_VERSION_MAJOR(version_token); priv->shader_version.minor = WINED3D_SM4_VERSION_MINOR(version_token); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e9e3f86..9ab1843 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -929,6 +929,7 @@ enum wined3d_shader_type WINED3D_SHADER_TYPE_COMPUTE = WINED3D_SHADER_TYPE_GRAPHICS_COUNT, WINED3D_SHADER_TYPE_COUNT, + WINED3D_SHADER_TYPE_INVALID = WINED3D_SHADER_TYPE_COUNT, }; struct wined3d_shader_version @@ -1265,6 +1266,9 @@ struct wined3d_shader_frontend extern const struct wined3d_shader_frontend sm1_shader_frontend DECLSPEC_HIDDEN; extern const struct wined3d_shader_frontend sm4_shader_frontend DECLSPEC_HIDDEN; +enum wined3d_shader_type wined3d_get_sm4_shader_type(const DWORD *byte_code, + size_t byte_code_size) DECLSPEC_HIDDEN; + typedef void (*SHADER_HANDLER)(const struct wined3d_shader_instruction *); #define WINED3D_SHADER_CAP_VS_CLIPPING 0x00000001

1 0

Alexandre Julliard : testbot: Add a missing return.
by Alexandre Julliard 22 Apr '18

22 Apr '18

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 22 Apr '18

22 Apr '18

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 22 Apr '18

22 Apr '18

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 22 Apr '18

22 Apr '18

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

Zebediah Figura : msi: Make MsiGetSummaryInformation() RPC-compatible.
by Alexandre Julliard 20 Apr '18

20 Apr '18

Module: wine Branch: master Commit: bf5589311de8ac2c74e3bd73bef32337a2ce8df2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf5589311de8ac2c74e3bd73… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 19 23:44:18 2018 -0500 msi: Make MsiGetSummaryInformation() RPC-compatible. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/database.c | 5 ++--- dlls/msi/suminfo.c | 17 +++++------------ dlls/msi/tests/custom.c | 11 ++++++++++- dlls/msi/winemsi.idl | 2 +- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 7c0c4a9..4a05593 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1922,10 +1922,9 @@ UINT __cdecl remote_DatabaseGetPrimaryKeys(MSIHANDLE db, LPCWSTR table, struct w return r; } -HRESULT __cdecl remote_DatabaseGetSummaryInformation(MSIHANDLE db, UINT updatecount, MSIHANDLE *suminfo) +UINT __cdecl remote_DatabaseGetSummaryInformation(MSIHANDLE db, UINT updatecount, MSIHANDLE *suminfo) { - UINT r = MsiGetSummaryInformationW(db, NULL, updatecount, suminfo); - return HRESULT_FROM_WIN32(r); + return MsiGetSummaryInformationW(db, NULL, updatecount, suminfo); } UINT __cdecl remote_DatabaseOpenView(MSIHANDLE db, LPCWSTR query, MSIHANDLE *view) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 782ad6e..288ba40 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -523,23 +523,16 @@ UINT WINAPI MsiGetSummaryInformationW( MSIHANDLE hDatabase, db = msihandle2msiinfo( hDatabase, MSIHANDLETYPE_DATABASE ); if( !db ) { - MSIHANDLE remote; - HRESULT hr; + MSIHANDLE remote, remote_suminfo; if (!(remote = msi_get_remote(hDatabase))) return ERROR_INVALID_HANDLE; - hr = remote_DatabaseGetSummaryInformation(remote, uiUpdateCount, pHandle); + ret = remote_DatabaseGetSummaryInformation(remote, uiUpdateCount, &remote_suminfo); + if (!ret) + *pHandle = alloc_msi_remote_handle(remote_suminfo); - if (FAILED(hr)) - { - if (HRESULT_FACILITY(hr) == FACILITY_WIN32) - return HRESULT_CODE(hr); - - return ERROR_FUNCTION_FAILED; - } - - return ERROR_SUCCESS; + return ret; } } diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index cdefefd..e782311 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -243,7 +243,7 @@ static void test_props(MSIHANDLE hinst) static void test_db(MSIHANDLE hinst) { - MSIHANDLE hdb, view, rec, rec2; + MSIHANDLE hdb, view, rec, rec2, suminfo; char buffer[10]; DWORD sz; UINT r; @@ -413,6 +413,15 @@ static void test_db(MSIHANDLE hinst) r = MsiCloseHandle(rec); ok(hinst, !r, "got %u\n", r); + r = MsiGetSummaryInformationA(hdb, NULL, 1, NULL); + ok(hinst, r == ERROR_INVALID_PARAMETER, "got %u\n", r); + + r = MsiGetSummaryInformationA(hdb, NULL, 1, &suminfo); + ok(hinst, !r, "got %u\n", r); + + r = MsiCloseHandle(suminfo); + ok(hinst, !r, "got %u\n", r); + r = MsiCloseHandle(hdb); ok(hinst, !r, "got %u\n", r); } diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index 28c3ab1..7613fd3 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -67,7 +67,7 @@ interface IWineMsiRemote MSICONDITION remote_DatabaseIsTablePersistent( [in] MSIHANDLE db, [in] LPCWSTR table ); UINT remote_DatabaseGetPrimaryKeys( [in] MSIHANDLE db, [in, string] LPCWSTR table, [out] struct wire_record **keys ); - HRESULT remote_DatabaseGetSummaryInformation( [in] MSIHANDLE db, [in] UINT updatecount, [out] MSIHANDLE *suminfo ); + UINT remote_DatabaseGetSummaryInformation( [in] MSIHANDLE db, [in] UINT updatecount, [out] MSIHANDLE *suminfo ); UINT remote_DatabaseOpenView( [in] MSIHANDLE db, [in, string] LPCWSTR query, [out] MSIHANDLE *view ); MSIHANDLE remote_GetActiveDatabase( [in] MSIHANDLE hinst );

1 0

Dmitry Timoshkov : mstask: Implement IPersistFile::GetClassID().
by Alexandre Julliard 20 Apr '18

20 Apr '18

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

Dmitry Timoshkov : mstask: Implement ITask::GetStatus().
by Alexandre Julliard 20 Apr '18

20 Apr '18

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: ITask::GetErrorRetryCount() is not implemented.
by Alexandre Julliard 20 Apr '18

20 Apr '18

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: ITask::GetErrorRetryInterval() is not implemented.
by Alexandre Julliard 20 Apr '18

20 Apr '18

Module: wine Branch: master Commit: 9d113d353b8c7c0d288c640d45889ecb31dfa72a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d113d353b8c7c0d288c640d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 20 16:37:15 2018 +0800 mstask: ITask::GetErrorRetryInterval() 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 | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 26cefcd..3f68afb 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -400,11 +400,9 @@ static HRESULT WINAPI MSTASK_ITask_SetErrorRetryInterval( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_GetErrorRetryInterval( - ITask* iface, - WORD *pwRetryInterval) +static HRESULT WINAPI MSTASK_ITask_GetErrorRetryInterval(ITask *iface, WORD *interval) { - FIXME("(%p, %p): stub\n", iface, pwRetryInterval); + TRACE("(%p, %p)\n", iface, interval); return E_NOTIMPL; } diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 3739db0..5256424 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -541,6 +541,12 @@ static void test_task_state(void) hr = ITask_GetErrorRetryCount(test_task, &val1); ok(hr == E_NOTIMPL, "got %#x\n", hr); + if (0) /* crashes under Windows */ + hr = ITask_GetErrorRetryInterval(test_task, NULL); + + hr = ITask_GetErrorRetryInterval(test_task, &val1); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + cleanup_task(); }

1 0