March 2015 - Wine-commits - list.winehq.org

Alexandre Julliard : Release 1.7.39.
by Alexandre Julliard 20 Mar '15

20 Mar '15

Module: wine Branch: master Commit: f34ec94308514d4379d7af2e73e78c3b99a94c75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f34ec94308514d4379d7af2e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 20 22:41:44 2015 +0900 Release 1.7.39. --- ANNOUNCE | 881 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 454 insertions(+), 449 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f34ec94308514d4379d7a…

1 0

Tag wine-1.7.39 : Alexandre Julliard : Release 1.7.39
by Alexandre Julliard 20 Mar '15

20 Mar '15

Module: wine Branch: refs/tags/wine-1.7.39 Tag: af9a8238f917650f541817bb6a42cb22a9e3a320 URL: http://source.winehq.org/git/wine.git/?a=tag;h=af9a8238f917650f541817bb6a42… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 20 22:41:44 2015 +0900 Release 1.7.39

1 0

Nikolay Sivov : ole32: Fix error handling in GetTimeOfLastChange() for item moniker (PVS-Studio).
by Alexandre Julliard 20 Mar '15

20 Mar '15

Module: wine Branch: master Commit: f294ea8333608047dbb18cb924d68b5af68f8a0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f294ea8333608047dbb18cb92… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 20 09:41:34 2015 +0300 ole32: Fix error handling in GetTimeOfLastChange() for item moniker (PVS-Studio). --- dlls/ole32/itemmoniker.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index e8e5d23..eaf76a3 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -601,8 +601,14 @@ static HRESULT WINAPI ItemMonikerImpl_GetTimeOfLastChange(IMoniker* iface, /* IMoniker::GetTimeOfLastChange on the pmkToLeft parameter. */ res=CreateGenericComposite(pmkToLeft,iface,&compositeMk); + if (FAILED(res)) + return res; res=IBindCtx_GetRunningObjectTable(pbc,&rot); + if (FAILED(res)) { + IMoniker_Release(compositeMk); + return res; + } if (IRunningObjectTable_GetTimeOfLastChange(rot,compositeMk,pItemTime)!=S_OK)

1 0

Nikolay Sivov : ole32: Improve error handling in GetClassFile() ( PVS-Studio).
by Alexandre Julliard 20 Mar '15

20 Mar '15

Module: wine Branch: master Commit: 853dc5ec2f474b892ff9d83efcf892345b0a9664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=853dc5ec2f474b892ff9d83ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 20 09:49:56 2015 +0300 ole32: Improve error handling in GetClassFile() (PVS-Studio). --- dlls/ole32/moniker.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index d694df9..5c46de9 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -1198,7 +1198,7 @@ HRESULT WINAPI GetClassFile(LPCOLESTR filePathName,CLSID *pclsid) IStorage *pstg=0; HRESULT res; int nbElm, length, i; - LONG sizeProgId; + LONG sizeProgId, ret; LPOLESTR *pathDec=0,absFile=0,progId=0; LPWSTR extension; static const WCHAR bkslashW[] = {'\\',0}; @@ -1264,26 +1264,23 @@ HRESULT WINAPI GetClassFile(LPCOLESTR filePathName,CLSID *pclsid) return MK_E_INVALIDEXTENSION; } - res=RegQueryValueW(HKEY_CLASSES_ROOT, extension, NULL, &sizeProgId); + ret = RegQueryValueW(HKEY_CLASSES_ROOT, extension, NULL, &sizeProgId); /* get the progId associated to the extension */ progId = CoTaskMemAlloc(sizeProgId); - res = RegQueryValueW(HKEY_CLASSES_ROOT, extension, progId, &sizeProgId); - - if (res==ERROR_SUCCESS) + ret = RegQueryValueW(HKEY_CLASSES_ROOT, extension, progId, &sizeProgId); + if (!ret) /* return the clsid associated to the progId */ - res= CLSIDFromProgID(progId,pclsid); + res = CLSIDFromProgID(progId,pclsid); + else + res = HRESULT_FROM_WIN32(ret); for(i=0; pathDec[i]!=NULL;i++) CoTaskMemFree(pathDec[i]); CoTaskMemFree(pathDec); CoTaskMemFree(progId); - - if (res==ERROR_SUCCESS) - return res; - - return MK_E_INVALIDEXTENSION; + return res != S_OK ? MK_E_INVALIDEXTENSION : res; } /***********************************************************************

1 0

André Hentschel : msvcp90: Cleanup macro usage.
by Alexandre Julliard 20 Mar '15

20 Mar '15

Module: wine Branch: master Commit: e0121ad32ac6088404f381d899b8ea23c26895a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0121ad32ac6088404f381d89… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 19 21:36:04 2015 +0100 msvcp90: Cleanup macro usage. --- dlls/msvcp90/misc.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index db68f6d..51b2a67 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -28,14 +28,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcp); -#define SECSPERDAY 86400 -/* 1601 to 1970 is 369 years plus 89 leap days */ -#define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)SECSPERDAY) -#define TICKSPERSEC 10000000 -#define TICKS_1601_TO_1970 (SECS_1601_TO_1970 * TICKSPERSEC) -#define NANOSEC_PER_MILLISEC 1000000 -#define MILLISEC_PER_SEC 1000 - struct __Container_proxy; typedef struct { @@ -361,6 +353,15 @@ void __thiscall _Container_base12__Swap_all( } #if _MSVCP_VER >= 110 + +#define SECSPERDAY 86400 +/* 1601 to 1970 is 369 years plus 89 leap days */ +#define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)SECSPERDAY) +#define TICKSPERSEC 10000000 +#define TICKS_1601_TO_1970 (SECS_1601_TO_1970 * TICKSPERSEC) +#define NANOSEC_PER_MILLISEC 1000000 +#define MILLISEC_PER_SEC 1000 + typedef int MSVCRT_long; /* xtime */ @@ -440,16 +441,6 @@ unsigned int __cdecl _Random_device(void) #if _MSVCP_VER >= 110 #if defined(__i386__) && !defined(__arm__) -#define THISCALL(func) __thiscall_ ## func -#define __thiscall __stdcall -#define DEFINE_THISCALL_WRAPPER(func,args) \ - extern void THISCALL(func)(void); \ - __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ - "popl %eax\n\t" \ - "pushl %ecx\n\t" \ - "pushl %eax\n\t" \ - "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) - extern void *call_thiscall_func; __ASM_GLOBAL_FUNC(call_thiscall_func, "popl %eax\n\t" @@ -462,9 +453,6 @@ __ASM_GLOBAL_FUNC(call_thiscall_func, #else /* __i386__ */ -#define __thiscall __cdecl -#define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ - #define call_func1(func,this) func(this) #endif /* __i386__ */

1 0

André Hentschel : dinput/tests: Avoid assigning values twice (PVS-Studio).
by Alexandre Julliard 20 Mar '15

20 Mar '15

Module: wine Branch: master Commit: 765abb771fd611d87711c633973e1c7b5a787133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=765abb771fd611d87711c6339… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 19 22:11:31 2015 +0100 dinput/tests: Avoid assigning values twice (PVS-Studio). --- dlls/dinput/tests/joystick.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index e5bb4eb..b196ea7 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -535,7 +535,6 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) dip_gain_set.diph.dwHeaderSize = sizeof(DIPROPHEADER); dip_gain_set.diph.dwObj = 0; dip_gain_set.diph.dwHow = DIPH_DEVICE; - dip_gain_set.dwData = 10000; dip_gain_get.diph.dwSize = sizeof(DIPROPDWORD); dip_gain_get.diph.dwHeaderSize = sizeof(DIPROPHEADER); dip_gain_get.diph.dwObj = 0;

1 0

André Hentschel : shlwapi: Avoid assigning values twice (PVS-Studio).
by Alexandre Julliard 20 Mar '15

20 Mar '15

Module: wine Branch: master Commit: e26e33fa0631b7d12b94bc353a7f2863e043a020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e26e33fa0631b7d12b94bc353… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 19 22:11:46 2015 +0100 shlwapi: Avoid assigning values twice (PVS-Studio). --- dlls/shlwapi/string.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index ca2f9b9..6e90b4e 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -2705,8 +2705,7 @@ DWORD WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, mem = HeapAlloc(GetProcessHeap(), 0, reqLen); if (mem) { - reqLen = WideCharToMultiByte(CodePage, 0, lpSrcStr, len, mem, - reqLen, NULL, NULL); + WideCharToMultiByte(CodePage, 0, lpSrcStr, len, mem, reqLen, NULL, NULL); reqLen = SHTruncateString(mem, dstlen -1); reqLen++;

1 0

André Hentschel : gameux: Return function result on error (PVS-Studio).
by Alexandre Julliard 20 Mar '15

20 Mar '15

Module: wine Branch: master Commit: 8f00116b6cb2fa283ca0d7b26b267e3a78a70c85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f00116b6cb2fa283ca0d7b26… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 19 22:11:38 2015 +0100 gameux: Return function result on error (PVS-Studio). --- dlls/gameux/gamestatistics.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index ff57b77..e6e33bb 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -627,6 +627,7 @@ static HRESULT GAMEUX_loadGameStatistics(struct GAMEUX_STATS *pStats, TRACE("(%p, %s, %d, %p)\n", pStats, debugstr_w(sGameId), openType, pOpenResult); hr = GAMEUX_buildStatisticsFilePath(sGameId, pStats->sStatsFile); + if (FAILED(hr)) return hr; hr = GAMEUX_loadStatisticsFromFile(pStats); TRACE("ldstats finished, res: %#x\n", hr);

1 0

Jacek Caban : wmvcore: Added IWMWriterAdvanced3 stub implementation.
by Alexandre Julliard 20 Mar '15

20 Mar '15

Module: wine Branch: master Commit: 63dd502c3a9b476e576ebefd97b532df99c0a8dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=63dd502c3a9b476e576ebefd9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 19 16:12:15 2015 +0100 wmvcore: Added IWMWriterAdvanced3 stub implementation. --- dlls/wmvcore/writer.c | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 165 insertions(+) diff --git a/dlls/wmvcore/writer.c b/dlls/wmvcore/writer.c index 3629d4d..f570148 100644 --- a/dlls/wmvcore/writer.c +++ b/dlls/wmvcore/writer.c @@ -25,6 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); typedef struct { IWMWriter IWMWriter_iface; + IWMWriterAdvanced3 IWMWriterAdvanced3_iface; LONG ref; } WMWriter; @@ -43,6 +44,15 @@ static HRESULT WINAPI WMWriter_QueryInterface(IWMWriter *iface, REFIID riid, voi }else if(IsEqualGUID(&IID_IWMWriter, riid)) { TRACE("(%p)->(IID_IWMWriter %p)\n", This, ppv); *ppv = &This->IWMWriter_iface; + }else if(IsEqualGUID(&IID_IWMWriterAdvanced, riid)) { + TRACE("(%p)->(IID_IWMWriterAdvanced %p)\n", This, ppv); + *ppv = &This->IWMWriterAdvanced3_iface; + }else if(IsEqualGUID(&IID_IWMWriterAdvanced2, riid)) { + TRACE("(%p)->(IID_IWMWriterAdvanced2 %p)\n", This, ppv); + *ppv = &This->IWMWriterAdvanced3_iface; + }else if(IsEqualGUID(&IID_IWMWriterAdvanced3, riid)) { + TRACE("(%p)->(IID_IWMWriterAdvanced3 %p)\n", This, ppv); + *ppv = &This->IWMWriterAdvanced3_iface; }else { FIXME("Unsupported iface %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -188,6 +198,160 @@ static const IWMWriterVtbl WMWriterVtbl = { WMWriter_Flush }; +static inline WMWriter *impl_from_IWMWriterAdvanced3(IWMWriterAdvanced3 *iface) +{ + return CONTAINING_RECORD(iface, WMWriter, IWMWriterAdvanced3_iface); +} + +static HRESULT WINAPI WMWriterAdvanced_QueryInterface(IWMWriterAdvanced3 *iface, REFIID riid, void **ppv) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + return IWMWriter_QueryInterface(&This->IWMWriter_iface, riid, ppv); +} + +static ULONG WINAPI WMWriterAdvanced_AddRef(IWMWriterAdvanced3 *iface) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + return IWMWriter_AddRef(&This->IWMWriter_iface); +} + +static ULONG WINAPI WMWriterAdvanced_Release(IWMWriterAdvanced3 *iface) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + return IWMWriter_Release(&This->IWMWriter_iface); +} + +static HRESULT WINAPI WMWriterAdvanced_GetSinkCount(IWMWriterAdvanced3 *iface, DWORD *sinks) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%p)\n", This, sinks); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_GetSink(IWMWriterAdvanced3 *iface, DWORD sink_num, IWMWriterSink **sink) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%u %p)\n", This, sink_num, sink); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_AddSink(IWMWriterAdvanced3 *iface, IWMWriterSink *sink) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%p)\n", This, sink); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_RemoveSink(IWMWriterAdvanced3 *iface, IWMWriterSink *sink) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%p)\n", This, sink); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_WriteStreamSample(IWMWriterAdvanced3 *iface, WORD stream_num, + QWORD sample_time, DWORD sample_send_time, QWORD sample_duration, DWORD flags, INSSBuffer *sample) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%u %s %u %s %x %p)\n", This, stream_num, wine_dbgstr_longlong(sample_time), + sample_send_time, wine_dbgstr_longlong(sample_duration), flags, sample); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_SetLiveSource(IWMWriterAdvanced3 *iface, BOOL is_live_source) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%x)\n", This, is_live_source); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_IsRealTime(IWMWriterAdvanced3 *iface, BOOL *real_time) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%p)\n", This, real_time); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_GetWriterTime(IWMWriterAdvanced3 *iface, QWORD *current_time) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%p)\n", This, current_time); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_GetStatistics(IWMWriterAdvanced3 *iface, WORD stream_num, WM_WRITER_STATISTICS *stats) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%u %p)\n", This, stream_num, stats); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_SetSyncTolerance(IWMWriterAdvanced3 *iface, DWORD window) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%u)\n", This, window); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_GetSyncTolerance(IWMWriterAdvanced3 *iface, DWORD *window) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%p)\n", This, window); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced2_GetInputSetting(IWMWriterAdvanced3 *iface, DWORD input_num, + const WCHAR *name, WMT_ATTR_DATATYPE *time, BYTE *value, WORD *length) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%u %s %p %p %p)\n", This, input_num, debugstr_w(name), time, value, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced2_SetInputSetting(IWMWriterAdvanced3 *iface, DWORD input_num, + const WCHAR *name, WMT_ATTR_DATATYPE type, const BYTE *value, WORD length) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%u %s %d %p %u)\n", This, input_num, debugstr_w(name), type, value, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced3_GetStatisticsEx(IWMWriterAdvanced3 *iface, WORD stream_num, + WM_WRITER_STATISTICS_EX *stats) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%u %p)\n", This, stream_num, stats); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced3_SetNonBlocking(IWMWriterAdvanced3 *iface) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static const IWMWriterAdvanced3Vtbl WMWriterAdvanced3Vtbl = { + WMWriterAdvanced_QueryInterface, + WMWriterAdvanced_AddRef, + WMWriterAdvanced_Release, + WMWriterAdvanced_GetSinkCount, + WMWriterAdvanced_GetSink, + WMWriterAdvanced_AddSink, + WMWriterAdvanced_RemoveSink, + WMWriterAdvanced_WriteStreamSample, + WMWriterAdvanced_SetLiveSource, + WMWriterAdvanced_IsRealTime, + WMWriterAdvanced_GetWriterTime, + WMWriterAdvanced_GetStatistics, + WMWriterAdvanced_SetSyncTolerance, + WMWriterAdvanced_GetSyncTolerance, + WMWriterAdvanced2_GetInputSetting, + WMWriterAdvanced2_SetInputSetting, + WMWriterAdvanced3_GetStatisticsEx, + WMWriterAdvanced3_SetNonBlocking +}; + HRESULT WINAPI WMCreateWriter(IUnknown *reserved, IWMWriter **writer) { WMWriter *ret; @@ -199,6 +363,7 @@ HRESULT WINAPI WMCreateWriter(IUnknown *reserved, IWMWriter **writer) return E_OUTOFMEMORY; ret->IWMWriter_iface.lpVtbl = &WMWriterVtbl; + ret->IWMWriterAdvanced3_iface.lpVtbl = &WMWriterAdvanced3Vtbl; ret->ref = 1; *writer = &ret->IWMWriter_iface;

1 0

Nikolay Sivov : mstask: Added IEnumWorkItems stub.
by Alexandre Julliard 20 Mar '15

20 Mar '15

Module: wine Branch: master Commit: 7aa2e9a9d057e61f3a9672d54819c8fd7e6fe943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aa2e9a9d057e61f3a9672d54… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 20 08:32:36 2015 +0300 mstask: Added IEnumWorkItems stub. --- dlls/mstask/task_scheduler.c | 120 ++++++++++++++++++++++++++++++++++++- dlls/mstask/tests/task_scheduler.c | 22 +++++++ 2 files changed, 139 insertions(+), 3 deletions(-) diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index 5657e43..1f367ed 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -28,11 +28,22 @@ typedef struct LONG ref; } TaskSchedulerImpl; +typedef struct +{ + IEnumWorkItems IEnumWorkItems_iface; + LONG ref; +} EnumWorkItemsImpl; + static inline TaskSchedulerImpl *impl_from_ITaskScheduler(ITaskScheduler *iface) { return CONTAINING_RECORD(iface, TaskSchedulerImpl, ITaskScheduler_iface); } +static inline EnumWorkItemsImpl *impl_from_IEnumWorkItems(IEnumWorkItems *iface) +{ + return CONTAINING_RECORD(iface, EnumWorkItemsImpl, IEnumWorkItems_iface); +} + static void TaskSchedulerDestructor(TaskSchedulerImpl *This) { TRACE("%p\n", This); @@ -40,6 +51,103 @@ static void TaskSchedulerDestructor(TaskSchedulerImpl *This) InterlockedDecrement(&dll_ref); } +static HRESULT WINAPI EnumWorkItems_QueryInterface(IEnumWorkItems *iface, REFIID riid, void **obj) +{ + EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IEnumWorkItems) || IsEqualGUID(riid, &IID_IUnknown)) + { + *obj = &This->IEnumWorkItems_iface; + IEnumWorkItems_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI EnumWorkItems_AddRef(IEnumWorkItems *iface) +{ + EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + return ref; +} + +static ULONG WINAPI EnumWorkItems_Release(IEnumWorkItems *iface) +{ + EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%u)\n", This, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + InterlockedDecrement(&dll_ref); + } + + return ref; +} + +static HRESULT WINAPI EnumWorkItems_Next(IEnumWorkItems *iface, ULONG count, LPWSTR **names, ULONG *fetched) +{ + EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); + FIXME("(%p)->(%u %p %p): stub\n", This, count, names, fetched); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumWorkItems_Skip(IEnumWorkItems *iface, ULONG count) +{ + EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); + FIXME("(%p)->(%u): stub\n", This, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumWorkItems_Reset(IEnumWorkItems *iface) +{ + EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumWorkItems_Clone(IEnumWorkItems *iface, IEnumWorkItems **cloned) +{ + EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); + FIXME("(%p)->(%p): stub\n", This, cloned); + return E_NOTIMPL; +} + +static const IEnumWorkItemsVtbl EnumWorkItemsVtbl = { + EnumWorkItems_QueryInterface, + EnumWorkItems_AddRef, + EnumWorkItems_Release, + EnumWorkItems_Next, + EnumWorkItems_Skip, + EnumWorkItems_Reset, + EnumWorkItems_Clone +}; + +static HRESULT create_task_enum(IEnumWorkItems **ret) +{ + EnumWorkItemsImpl *tasks; + + *ret = NULL; + + tasks = HeapAlloc(GetProcessHeap(), 0, sizeof(*tasks)); + if (!tasks) + return E_OUTOFMEMORY; + + tasks->IEnumWorkItems_iface.lpVtbl = &EnumWorkItemsVtbl; + tasks->ref = 1; + + *ret = &tasks->IEnumWorkItems_iface; + InterlockedIncrement(&dll_ref); + return S_OK; +} + static HRESULT WINAPI MSTASK_ITaskScheduler_QueryInterface( ITaskScheduler* iface, REFIID riid, @@ -140,10 +248,16 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_GetTargetComputer( static HRESULT WINAPI MSTASK_ITaskScheduler_Enum( ITaskScheduler* iface, - IEnumWorkItems **ppEnumTasks) + IEnumWorkItems **tasks) { - FIXME("%p, %p: stub\n", iface, ppEnumTasks); - return E_NOTIMPL; + TaskSchedulerImpl *This = impl_from_ITaskScheduler(iface); + + TRACE("(%p)->(%p)\n", This, tasks); + + if (!tasks) + return E_INVALIDARG; + + return create_task_enum(tasks); } static HRESULT WINAPI MSTASK_ITaskScheduler_Activate( diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index 428bf8c..3bf660f 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -203,6 +203,27 @@ static void test_SetTargetComputer(void) return; } +static void test_Enum(void) +{ + ITaskScheduler *scheduler; + IEnumWorkItems *tasks; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, + &IID_ITaskScheduler, (void **)&scheduler); + ok(hr == S_OK, "got 0x%08x\n", hr); + +if (0) { /* crashes on win2k */ + hr = ITaskScheduler_Enum(scheduler, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); +} + + hr = ITaskScheduler_Enum(scheduler, &tasks); + ok(hr == S_OK, "got 0x%08x\n", hr); + IEnumWorkItems_Release(tasks); + + ITaskScheduler_Release(scheduler); +} START_TEST(task_scheduler) { @@ -211,5 +232,6 @@ START_TEST(task_scheduler) test_Activate(); test_GetTargetComputer(); test_SetTargetComputer(); + test_Enum(); CoUninitialize(); }

1 0