November 2017 - Wine-Devel - list.winehq.org

[PATCH 3/5] mshtml: Pass listener type as a string to get_listener_container.
by Jacek Caban Nov. 30, 2017

Nov. 30, 2017

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-)

1 0

[PATCH 2/5] mshtml: Store listener container type as a string.
by Jacek Caban Nov. 30, 2017

Nov. 30, 2017

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)

1 0

[PATCH 1/5] mshtml: Removed unused impl_from_DispatchEx.
by Jacek Caban Nov. 30, 2017

Nov. 30, 2017

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 5 ----- 1 file changed, 5 deletions(-)

1 0

[PATCH] xaudio2: Ignore buffers returned from OpenAL after Stop
by Andrew Eikum Nov. 30, 2017

Nov. 30, 2017

For bug 40963. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xaudio2_7/tests/xaudio2.c | 78 +++++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_dll.c | 77 +++++++++++++++++++++++++--------------- dlls/xaudio2_7/xaudio_private.h | 2 +- 3 files changed, 127 insertions(+), 30 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 54176eaf86..ff402f87c4 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -841,6 +841,82 @@ static void test_submix(IXAudio2 *xa) IXAudio2MasteringVoice_DestroyVoice(master); } +static void test_flush(IXAudio2 *xa) +{ + HRESULT hr; + IXAudio2MasteringVoice *master; + IXAudio2SourceVoice *src; + WAVEFORMATEX fmt; + XAUDIO2_BUFFER buf; + XAUDIO2_VOICE_STATE state; + + XA2CALL_0V(StopEngine); + + if(xaudio27) + hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 2, 44100, 0, 0, NULL); + else + hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); + ok(hr == S_OK, "CreateMasteringVoice failed: %08x\n", hr); + + fmt.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; + fmt.nChannels = 2; + fmt.nSamplesPerSec = 44100; + fmt.wBitsPerSample = 32; + fmt.nBlockAlign = fmt.nChannels * fmt.wBitsPerSample / 8; + fmt.nAvgBytesPerSec = fmt.nSamplesPerSec * fmt.nBlockAlign; + fmt.cbSize = 0; + + XA2CALL(CreateSourceVoice, &src, &fmt, 0, 1.f, NULL, NULL, NULL); + ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); + + memset(&buf, 0, sizeof(buf)); + buf.AudioBytes = 22050 * fmt.nBlockAlign; + buf.pAudioData = HeapAlloc(GetProcessHeap(), 0, buf.AudioBytes); + fill_buf((float*)buf.pAudioData, &fmt, 440, 22050); + + hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_Start(src, 0, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "Start failed: %08x\n", hr); + + XA2CALL_0(StartEngine); + ok(hr == S_OK, "StartEngine failed: %08x\n", hr); + + while(1){ + if(xaudio27) + IXAudio27SourceVoice_GetState((IXAudio27SourceVoice*)src, &state); + else + IXAudio2SourceVoice_GetState(src, &state, 0); + if(state.SamplesPlayed >= 2205) + break; + Sleep(10); + } + + hr = IXAudio2SourceVoice_Stop(src, 0, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "Stop failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_FlushSourceBuffers(src); + ok(hr == S_OK, "FlushSourceBuffers failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_Start(src, 0, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "Start failed: %08x\n", hr); + + Sleep(100); + + hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + + if(xaudio27){ + IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src); + }else{ + IXAudio2SourceVoice_DestroyVoice(src); + } + IXAudio2MasteringVoice_DestroyVoice(master); + + HeapFree(GetProcessHeap(), 0, (void*)buf.pAudioData); +} + static UINT32 test_DeviceDetails(IXAudio27 *xa) { HRESULT hr; @@ -1136,6 +1212,7 @@ START_TEST(xaudio2) test_buffer_callbacks((IXAudio2*)xa27); test_looping((IXAudio2*)xa27); test_submix((IXAudio2*)xa27); + test_flush((IXAudio2*)xa27); }else skip("No audio devices available\n"); @@ -1159,6 +1236,7 @@ START_TEST(xaudio2) test_buffer_callbacks(xa); test_looping(xa); test_submix(xa); + test_flush(xa); }else skip("No audio devices available\n"); diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 13f591630f..8f15ded023 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -414,6 +414,7 @@ static void WINAPI XA2SRC_DestroyVoice(IXAudio2SourceVoice *iface) This->nbufs = 0; This->first_buf = 0; This->cur_buf = 0; + This->abandoned_albufs = 0; LeaveCriticalSection(&This->lock); } @@ -438,11 +439,18 @@ static HRESULT WINAPI XA2SRC_Stop(IXAudio2SourceVoice *iface, UINT32 Flags, UINT32 OperationSet) { XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + ALint bufs; TRACE("%p, 0x%x, 0x%x\n", This, Flags, OperationSet); + palcSetThreadContext(This->xa2->al_ctx); + EnterCriticalSection(&This->lock); + alGetSourcei(This->al_src, AL_BUFFERS_QUEUED, &bufs); + + This->abandoned_albufs = bufs; + This->running = FALSE; LeaveCriticalSection(&This->lock); @@ -2273,44 +2281,53 @@ static void update_source_state(XA2SourceImpl *src) ALuint al_buffers[XAUDIO2_MAX_QUEUED_BUFFERS]; alSourceUnqueueBuffers(src->al_src, processed, al_buffers); + src->first_al_buf += processed; src->first_al_buf %= XAUDIO2_MAX_QUEUED_BUFFERS; src->al_bufs_used -= processed; - for(i = 0; i < processed; ++i){ - ALint bufsize; + if(processed > src->abandoned_albufs){ + for(i = src->abandoned_albufs; i < processed; ++i){ + ALint bufsize; - alGetBufferi(al_buffers[i], AL_SIZE, &bufsize); + alGetBufferi(al_buffers[i], AL_SIZE, &bufsize); - src->in_al_bytes -= bufsize; - src->played_frames += bufsize / src->submit_blocksize; + src->in_al_bytes -= bufsize; + src->played_frames += bufsize / src->submit_blocksize; - if(al_buffers[i] == src->buffers[src->first_buf].latest_al_buf){ - DWORD old_buf = src->first_buf; + if(al_buffers[i] == src->buffers[src->first_buf].latest_al_buf){ + DWORD old_buf = src->first_buf; - src->first_buf++; - src->first_buf %= XAUDIO2_MAX_QUEUED_BUFFERS; - src->nbufs--; + src->first_buf++; + src->first_buf %= XAUDIO2_MAX_QUEUED_BUFFERS; + src->nbufs--; - TRACE("%p: done with buffer %u\n", src, old_buf); + TRACE("%p: done with buffer %u\n", src, old_buf); - if(src->buffers[old_buf].xa2buffer.Flags & XAUDIO2_END_OF_STREAM) - src->played_frames = 0; - - if(src->cb){ - IXAudio2VoiceCallback_OnBufferEnd(src->cb, - src->buffers[old_buf].xa2buffer.pContext); if(src->buffers[old_buf].xa2buffer.Flags & XAUDIO2_END_OF_STREAM) - IXAudio2VoiceCallback_OnStreamEnd(src->cb); + src->played_frames = 0; - if(src->nbufs > 0) - IXAudio2VoiceCallback_OnBufferStart(src->cb, - src->buffers[src->first_buf].xa2buffer.pContext); + if(src->cb){ + IXAudio2VoiceCallback_OnBufferEnd(src->cb, + src->buffers[old_buf].xa2buffer.pContext); + if(src->buffers[old_buf].xa2buffer.Flags & XAUDIO2_END_OF_STREAM) + IXAudio2VoiceCallback_OnStreamEnd(src->cb); + + if(src->nbufs > 0) + IXAudio2VoiceCallback_OnBufferStart(src->cb, + src->buffers[src->first_buf].xa2buffer.pContext); + } } } - } + + src->abandoned_albufs = 0; + }else + src->abandoned_albufs -= processed; } + if(!src->running) + return; + alGetSourcei(src->al_src, AL_BYTE_OFFSET, &bufpos); /* maintain IN_AL_PERIODS periods in AL */ @@ -2384,12 +2401,12 @@ static void do_engine_tick(IXAudio2Impl *This) EnterCriticalSection(&src->lock); - if(!src->in_use || !src->running){ + if(!src->in_use){ LeaveCriticalSection(&src->lock); continue; } - if(src->cb){ + if(src->cb && This->running){ #if XAUDIO2_VER == 0 IXAudio20VoiceCallback_OnVoiceProcessingPassStart((IXAudio20VoiceCallback*)src->cb); #else @@ -2403,12 +2420,14 @@ static void do_engine_tick(IXAudio2Impl *This) update_source_state(src); - alGetSourcei(src->al_src, AL_SOURCE_STATE, &st); - if(st != AL_PLAYING) - alSourcePlay(src->al_src); + if(This->running){ + alGetSourcei(src->al_src, AL_SOURCE_STATE, &st); + if(st != AL_PLAYING) + alSourcePlay(src->al_src); - if(src->cb) - IXAudio2VoiceCallback_OnVoiceProcessingPassEnd(src->cb); + if(src->cb) + IXAudio2VoiceCallback_OnVoiceProcessingPassEnd(src->cb); + } LeaveCriticalSection(&src->lock); } diff --git a/dlls/xaudio2_7/xaudio_private.h b/dlls/xaudio2_7/xaudio_private.h index f28a0aec47..1a4aa08ce5 100644 --- a/dlls/xaudio2_7/xaudio_private.h +++ b/dlls/xaudio2_7/xaudio_private.h @@ -81,7 +81,7 @@ typedef struct _XA2SourceImpl { /* most cases will only need about 4 AL buffers, but some corner cases * could require up to MAX_QUEUED_BUFFERS */ ALuint al_bufs[XAUDIO2_MAX_QUEUED_BUFFERS]; - DWORD first_al_buf, al_bufs_used; + DWORD first_al_buf, al_bufs_used, abandoned_albufs; struct list entry; } XA2SourceImpl; -- 2.15.0

1 0

[PATCH 2/3] ntdll: Don't return an error when reading past EOF in NtReadFileScatter
by Andrew Eikum Nov. 30, 2017

Nov. 30, 2017

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 27 ++++++++++++++++++++++++++- dlls/ntdll/file.c | 3 --- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 44fbf7a4b1..e1cf268817 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4354,7 +4354,7 @@ static void test_WriteFileGather(void) OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; BOOL br; - char *wbuf = NULL, *rbuf1; + char *wbuf = NULL, *rbuf1, *rbuf2; ret = GetTempPathA( MAX_PATH, temp_path ); ok( ret != 0, "GetTempPathA error %d\n", GetLastError() ); @@ -4378,6 +4378,9 @@ static void test_WriteFileGather(void) rbuf1 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); ok( rbuf1 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + rbuf2 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( rbuf2 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + memset( &ovl, 0, sizeof(ovl) ); memset( fse, 0, sizeof(fse) ); memset( wbuf, 0x42, si.dwPageSize ); @@ -4405,11 +4408,33 @@ static void test_WriteFileGather(void) ok( memcmp( rbuf1, wbuf, si.dwPageSize ) == 0, "data was not read into buffer\n" ); + /* read past EOF */ + memset( &ovl, 0, sizeof(ovl) ); + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + fse[1].Buffer = rbuf2; + memset( rbuf1, 0, si.dwPageSize ); + memset( rbuf2, 0x17, si.dwPageSize ); + br = ReadFileScatter( hfile, fse, si.dwPageSize * 2, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + + ok( memcmp( rbuf1, wbuf, si.dwPageSize ) == 0, + "data was not read into buffer\n" ); + memset( rbuf1, 0x17, si.dwPageSize ); + ok( memcmp( rbuf2, rbuf1, si.dwPageSize ) == 0, + "data should not have been read into buffer\n" ); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); VirtualFree( wbuf, 0, MEM_RELEASE ); VirtualFree( rbuf1, 0, MEM_RELEASE ); + VirtualFree( rbuf2, 0, MEM_RELEASE ); DeleteFileA( filename ); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index bdfc383d7e..f7db24cc8b 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1071,10 +1071,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap break; } if (!result) - { - status = STATUS_END_OF_FILE; break; - } total += result; length -= result; if ((pos += result) == page_size) -- 2.15.0

2 2

A dead condition in dlls/oleaut32/variant.c
by Gerald Pfeifer Nov. 30, 2017

Nov. 30, 2017

dlls/oleaut32/variant.c has the following code else if ((dwVtBits & REAL_VTBITS) == VTBIT_DECIMAL) where REAL_VTBITS is defined as VTBIT_R4|VTBIT_R8|VTBIT_CY with VTBIT_R4 := 1 << VT_R4 and VT_R4 := 4 in wtypes.h, VTBIT_R8 := 1 << VT_R8 and VT_R8 := 5, VTBIT_CY := 1 << VT_CY and VT_CY := 6. VTBIT_DECIMAL, on the other hand is 1 << VT_DECIMAL with VT_DECIMAL = 14. Now perhaps I am missing something quite obvious, but isn't that condition always false since REAL_VTBITS are disjoint from VTBIT_DECIMAL and we are first masking bits 5, 6, and 7 and then comparing with bit 15? (If you fix this, you may want to give credit to GCC 8 for pointing me towards that code.) Gerald

1 0

[PATCH 8/8] taskschd: Implement IExecAction_get_Path.
by Hans Leidekker Nov. 30, 2017

Nov. 30, 2017

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 16 ++++++++++++++-- dlls/taskschd/tests/scheduler.c | 13 +++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 01e7c2d6bb..df75236d9d 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1740,8 +1740,20 @@ static HRESULT WINAPI ExecAction_get_Type(IExecAction *iface, TASK_ACTION_TYPE * static HRESULT WINAPI ExecAction_get_Path(IExecAction *iface, BSTR *path) { - FIXME("%p,%p: stub\n", iface, path); - return E_NOTIMPL; + ExecAction *action = impl_from_IExecAction(iface); + + TRACE("%p,%p\n", iface, path); + + if (!path) return E_POINTER; + + if (!action->path) + { + *path = NULL; + return S_OK; + } + + if (!(*path = SysAllocString(action->path))) return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI ExecAction_put_Path(IExecAction *iface, BSTR path) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 22854d917c..c7de7c7041 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1236,6 +1236,7 @@ static void create_action(ITaskDefinition *taskdef) IAction *action; IExecAction *exec_action; TASK_ACTION_TYPE type; + BSTR path; hr = ITaskDefinition_get_Actions(taskdef, &actions); ok(hr == S_OK, "get_Actions error %#x\n", hr); @@ -1251,9 +1252,21 @@ static void create_action(ITaskDefinition *taskdef) ok(hr == S_OK, "get_Type error %#x\n", hr); ok(type == TASK_ACTION_EXEC, "got %u\n", type ); + path = (BSTR)0xdeadbeef; + hr = IExecAction_get_Path(exec_action, &path); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(path == NULL, "path not set\n"); + hr = IExecAction_put_Path(exec_action, task1_exe); ok(hr == S_OK, "put_Path error %#x\n", hr); + path = NULL; + hr = IExecAction_get_Path(exec_action, &path); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(path != NULL, "path not set\n"); + ok(!lstrcmpW(path, task1_exe), "wrong path\n" ); + SysFreeString(path); + IExecAction_Release(exec_action); IAction_Release(action); IActionCollection_Release(actions); -- 2.11.0

1 0

[PATCH 7/8] taskschd: Implement IExecAction_put_Path.
by Hans Leidekker Nov. 30, 2017

Nov. 30, 2017

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index f32d3d28e1..01e7c2d6bb 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1638,6 +1638,7 @@ typedef struct { IExecAction IExecAction_iface; LONG ref; + WCHAR *path; } ExecAction; static inline ExecAction *impl_from_IExecAction(IExecAction *iface) @@ -1659,6 +1660,7 @@ static ULONG WINAPI ExecAction_Release(IExecAction *iface) if (!ref) { TRACE("destroying %p\n", iface); + heap_free(action->path); heap_free(action); } @@ -1744,7 +1746,15 @@ static HRESULT WINAPI ExecAction_get_Path(IExecAction *iface, BSTR *path) static HRESULT WINAPI ExecAction_put_Path(IExecAction *iface, BSTR path) { - FIXME("%p,%s: stub\n", iface, debugstr_w(path)); + ExecAction *action = impl_from_IExecAction(iface); + WCHAR *str = NULL; + + TRACE("%p,%s\n", iface, debugstr_w(path)); + + if (path && !(str = heap_strdupW((path)))) return E_OUTOFMEMORY; + heap_free(action->path); + action->path = str; + return S_OK; } @@ -1801,6 +1811,7 @@ static HRESULT ExecAction_create(IExecAction **obj) action->IExecAction_iface.lpVtbl = &Action_vtbl; action->ref = 1; + action->path = NULL; *obj = &action->IExecAction_iface; -- 2.11.0

1 0

[PATCH 6/8] taskschd: Implement IActionCollection_Create.
by Hans Leidekker Nov. 30, 2017

Nov. 30, 2017

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 188 +++++++++++++++++++++++++++++++++++++++- dlls/taskschd/tests/scheduler.c | 13 ++- 2 files changed, 192 insertions(+), 9 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 1c20f837c2..f32d3d28e1 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1636,6 +1636,181 @@ static HRESULT Principal_create(IPrincipal **obj) typedef struct { + IExecAction IExecAction_iface; + LONG ref; +} ExecAction; + +static inline ExecAction *impl_from_IExecAction(IExecAction *iface) +{ + return CONTAINING_RECORD(iface, ExecAction, IExecAction_iface); +} + +static ULONG WINAPI ExecAction_AddRef(IExecAction *iface) +{ + ExecAction *action = impl_from_IExecAction(iface); + return InterlockedIncrement(&action->ref); +} + +static ULONG WINAPI ExecAction_Release(IExecAction *iface) +{ + ExecAction *action = impl_from_IExecAction(iface); + LONG ref = InterlockedDecrement(&action->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + heap_free(action); + } + + return ref; +} + +static HRESULT WINAPI ExecAction_QueryInterface(IExecAction *iface, REFIID riid, void **obj) +{ + if (!riid || !obj) return E_INVALIDARG; + + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IExecAction) || + IsEqualGUID(riid, &IID_IAction) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IExecAction_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static HRESULT WINAPI ExecAction_GetTypeInfoCount(IExecAction *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_GetTypeInfo(IExecAction *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_GetIDsOfNames(IExecAction *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_Invoke(IExecAction *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + params, result, excepinfo, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_get_Id(IExecAction *iface, BSTR *id) +{ + FIXME("%p,%p: stub\n", iface, id); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_put_Id(IExecAction *iface, BSTR id) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(id)); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_get_Type(IExecAction *iface, TASK_ACTION_TYPE *type) +{ + TRACE("%p,%p\n", iface, type); + + if (!type) return E_POINTER; + + *type = TASK_ACTION_EXEC; + + return S_OK; +} + +static HRESULT WINAPI ExecAction_get_Path(IExecAction *iface, BSTR *path) +{ + FIXME("%p,%p: stub\n", iface, path); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_put_Path(IExecAction *iface, BSTR path) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(path)); + return S_OK; +} + +static HRESULT WINAPI ExecAction_get_Arguments(IExecAction *iface, BSTR *arguments) +{ + FIXME("%p,%p: stub\n", iface, arguments); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_put_Arguments(IExecAction *iface, BSTR arguments) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(arguments)); + return S_OK; +} + +static HRESULT WINAPI ExecAction_get_WorkingDirectory(IExecAction *iface, BSTR *directory) +{ + FIXME("%p,%p: stub\n", iface, directory); + return E_NOTIMPL; +} + +static HRESULT WINAPI ExecAction_put_WorkingDirectory(IExecAction *iface, BSTR directory) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(directory)); + return E_NOTIMPL; +} + +static const IExecActionVtbl Action_vtbl = +{ + ExecAction_QueryInterface, + ExecAction_AddRef, + ExecAction_Release, + ExecAction_GetTypeInfoCount, + ExecAction_GetTypeInfo, + ExecAction_GetIDsOfNames, + ExecAction_Invoke, + ExecAction_get_Id, + ExecAction_put_Id, + ExecAction_get_Type, + ExecAction_get_Path, + ExecAction_put_Path, + ExecAction_get_Arguments, + ExecAction_put_Arguments, + ExecAction_get_WorkingDirectory, + ExecAction_put_WorkingDirectory +}; + +static HRESULT ExecAction_create(IExecAction **obj) +{ + ExecAction *action; + + action = heap_alloc(sizeof(*action)); + if (!action) return E_OUTOFMEMORY; + + action->IExecAction_iface.lpVtbl = &Action_vtbl; + action->ref = 1; + + *obj = &action->IExecAction_iface; + + TRACE("created %p\n", *obj); + + return S_OK; +} + +typedef struct +{ IActionCollection IActionCollection_iface; LONG ref; } Actions; @@ -1744,8 +1919,17 @@ static HRESULT WINAPI Actions_put_XmlText(IActionCollection *iface, BSTR xml) static HRESULT WINAPI Actions_Create(IActionCollection *iface, TASK_ACTION_TYPE type, IAction **action) { - FIXME("%p,%u,%p: stub\n", iface, type, action); - return E_NOTIMPL; + TRACE("%p,%u,%p\n", iface, type, action); + + switch (type) + { + case TASK_ACTION_EXEC: + return ExecAction_create((IExecAction **)action); + + default: + FIXME("unimplemented type %u\n", type); + return E_NOTIMPL; + } } static HRESULT WINAPI Actions_Remove(IActionCollection *iface, VARIANT index) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 1df79d5a99..22854d917c 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1235,23 +1235,22 @@ static void create_action(ITaskDefinition *taskdef) IActionCollection *actions; IAction *action; IExecAction *exec_action; + TASK_ACTION_TYPE type; hr = ITaskDefinition_get_Actions(taskdef, &actions); ok(hr == S_OK, "get_Actions error %#x\n", hr); hr = IActionCollection_Create(actions, TASK_ACTION_EXEC, &action); -todo_wine ok(hr == S_OK, "Create action error %#x\n", hr); - /* FIXME: Remove once implemented */ - if (hr != S_OK) - { - IActionCollection_Release(actions); - return; - } hr = IAction_QueryInterface(action, &IID_IExecAction, (void **)&exec_action); ok(hr == S_OK, "QueryInterface error %#x\n", hr); + type = 0xdeadbeef; + hr = IExecAction_get_Type(exec_action, &type); + ok(hr == S_OK, "get_Type error %#x\n", hr); + ok(type == TASK_ACTION_EXEC, "got %u\n", type ); + hr = IExecAction_put_Path(exec_action, task1_exe); ok(hr == S_OK, "put_Path error %#x\n", hr); -- 2.11.0

1 0

[PATCH 5/8] taskschd: Implement ITaskDefinition_put_Actions.
by Hans Leidekker Nov. 30, 2017

Nov. 30, 2017

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 15 +++++++++++++-- dlls/taskschd/tests/scheduler.c | 10 ++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 166e58774d..1c20f837c2 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -2093,8 +2093,19 @@ static HRESULT WINAPI TaskDefinition_get_Actions(ITaskDefinition *iface, IAction static HRESULT WINAPI TaskDefinition_put_Actions(ITaskDefinition *iface, IActionCollection *actions) { - FIXME("%p,%p: stub\n", iface, actions); - return E_NOTIMPL; + TaskDefinition *taskdef = impl_from_ITaskDefinition(iface); + + TRACE("%p,%p\n", iface, actions); + + if (!actions) return E_POINTER; + + if (taskdef->actions) + IActionCollection_Release(taskdef->actions); + + IActionCollection_AddRef(actions); + taskdef->actions = actions; + + return S_OK; } static const WCHAR Task[] = {'T','a','s','k',0}; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 3d1d18ee5e..1df79d5a99 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1096,6 +1096,7 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ITaskSettings *set; ITriggerCollection *triggers; IPrincipal *principal; + IActionCollection *actions; hr = ITaskDefinition_get_Settings(taskdef, &set); ok(hr == S_OK, "get_Settings error %#x\n", hr); @@ -1178,6 +1179,15 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); if (principal) IPrincipal_Release(principal); + actions = NULL; + hr = ITaskDefinition_get_Actions(taskdef, &actions); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + ok(actions != NULL, "actions not set\n"); + + hr = ITaskDefinition_put_Actions(taskdef, actions); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + if (actions) IActionCollection_Release(actions); + /* FIXME: set IIdleSettings and INetworkSettings */ ITaskSettings_Release(set); -- 2.11.0

1 0

[PATCH 4/8] taskschd: Implement ITaskDefinition_get_Actions.
by Hans Leidekker Nov. 30, 2017

Nov. 30, 2017

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 203 ++++++++++++++++++++++++++++++++++++++-- dlls/taskschd/tests/scheduler.c | 10 +- 2 files changed, 204 insertions(+), 9 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 6828c987c0..166e58774d 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1636,6 +1636,182 @@ static HRESULT Principal_create(IPrincipal **obj) typedef struct { + IActionCollection IActionCollection_iface; + LONG ref; +} Actions; + +static inline Actions *impl_from_IActionCollection(IActionCollection *iface) +{ + return CONTAINING_RECORD(iface, Actions, IActionCollection_iface); +} + +static ULONG WINAPI Actions_AddRef(IActionCollection *iface) +{ + Actions *actions = impl_from_IActionCollection(iface); + return InterlockedIncrement(&actions->ref); +} + +static ULONG WINAPI Actions_Release(IActionCollection *iface) +{ + Actions *actions = impl_from_IActionCollection(iface); + LONG ref = InterlockedDecrement(&actions->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + heap_free(actions); + } + + return ref; +} + +static HRESULT WINAPI Actions_QueryInterface(IActionCollection *iface, REFIID riid, void **obj) +{ + if (!riid || !obj) return E_INVALIDARG; + + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IActionCollection) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IActionCollection_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static HRESULT WINAPI Actions_GetTypeInfoCount(IActionCollection *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_GetTypeInfo(IActionCollection *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_GetIDsOfNames(IActionCollection *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_Invoke(IActionCollection *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + params, result, excepinfo, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_get_Count(IActionCollection *iface, LONG *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_get_Item(IActionCollection *iface, LONG index, IAction **action) +{ + FIXME("%p,%d,%p: stub\n", iface, index, action); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_get__NewEnum(IActionCollection *iface, IUnknown **penum) +{ + FIXME("%p,%p: stub\n", iface, penum); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_get_XmlText(IActionCollection *iface, BSTR *xml) +{ + FIXME("%p,%p: stub\n", iface, xml); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_put_XmlText(IActionCollection *iface, BSTR xml) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(xml)); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_Create(IActionCollection *iface, TASK_ACTION_TYPE type, IAction **action) +{ + FIXME("%p,%u,%p: stub\n", iface, type, action); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_Remove(IActionCollection *iface, VARIANT index) +{ + FIXME("%p,%s: stub\n", iface, debugstr_variant(&index)); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_Clear(IActionCollection *iface) +{ + FIXME("%p: stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_get_Context(IActionCollection *iface, BSTR *ctx) +{ + FIXME("%p,%p: stub\n", iface, ctx); + return E_NOTIMPL; +} + +static HRESULT WINAPI Actions_put_Context(IActionCollection *iface, BSTR ctx) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(ctx)); + return S_OK; +} + +static const IActionCollectionVtbl Actions_vtbl = +{ + Actions_QueryInterface, + Actions_AddRef, + Actions_Release, + Actions_GetTypeInfoCount, + Actions_GetTypeInfo, + Actions_GetIDsOfNames, + Actions_Invoke, + Actions_get_Count, + Actions_get_Item, + Actions_get__NewEnum, + Actions_get_XmlText, + Actions_put_XmlText, + Actions_Create, + Actions_Remove, + Actions_Clear, + Actions_get_Context, + Actions_put_Context +}; + +static HRESULT Actions_create(IActionCollection **obj) +{ + Actions *actions; + + actions = heap_alloc(sizeof(*actions)); + if (!actions) return E_OUTOFMEMORY; + + actions->IActionCollection_iface.lpVtbl = &Actions_vtbl; + actions->ref = 1; + + *obj = &actions->IActionCollection_iface; + + TRACE("created %p\n", *obj); + + return S_OK; +} + +typedef struct +{ ITaskDefinition ITaskDefinition_iface; LONG ref; IRegistrationInfo *reginfo; @@ -1896,8 +2072,23 @@ static HRESULT WINAPI TaskDefinition_put_Principal(ITaskDefinition *iface, IPrin static HRESULT WINAPI TaskDefinition_get_Actions(ITaskDefinition *iface, IActionCollection **actions) { - FIXME("%p,%p: stub\n", iface, actions); - return E_NOTIMPL; + TaskDefinition *taskdef = impl_from_ITaskDefinition(iface); + HRESULT hr; + + TRACE("%p,%p\n", iface, actions); + + if (!actions) return E_POINTER; + + if (!taskdef->actions) + { + hr = Actions_create(&taskdef->actions); + if (hr != S_OK) return hr; + } + + IActionCollection_AddRef(taskdef->actions); + *actions = taskdef->actions; + + return S_OK; } static HRESULT WINAPI TaskDefinition_put_Actions(ITaskDefinition *iface, IActionCollection *actions) @@ -1938,7 +2129,7 @@ static const WCHAR S4U[] = {'S','4','U',0}; static const WCHAR InteractiveToken[] = {'I','n','t','e','r','a','c','t','i','v','e','T','o','k','e','n',0}; static const WCHAR RunLevel[] = {'R','u','n','L','e','v','e','l',0}; static const WCHAR LeastPrivilege[] = {'L','e','a','s','t','P','r','i','v','i','l','e','g','e',0}; -static const WCHAR Actions[] = {'A','c','t','i','o','n','s',0}; +static const WCHAR actionsW[] = {'A','c','t','i','o','n','s',0}; static const WCHAR Exec[] = {'E','x','e','c',0}; static const WCHAR MultipleInstancesPolicy[] = {'M','u','l','t','i','p','l','e','I','n','s','t','a','n','c','e','s','P','o','l','i','c','y',0}; static const WCHAR IgnoreNew[] = {'I','g','n','o','r','e','N','e','w',0}; @@ -2298,11 +2489,11 @@ static HRESULT write_actions(IStream *stream, IActionCollection *actions) { if (!actions) { - write_element(stream, Actions); + write_element(stream, actionsW); push_indent(); write_empty_element(stream, Exec); pop_indent(); - return write_element_end(stream, Actions); + return write_element_end(stream, actionsW); } FIXME("stub\n"); @@ -2958,7 +3149,7 @@ static HRESULT read_task(IXmlReader *reader, ITaskDefinition *taskdef) hr = read_triggers(reader, taskdef); else if (!lstrcmpW(name, Principals)) hr = read_principals(reader, taskdef); - else if (!lstrcmpW(name, Actions)) + else if (!lstrcmpW(name, actionsW)) hr = read_actions(reader, taskdef); else FIXME("unhandled Task element %s\n", debugstr_w(name)); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 244c28df01..3d1d18ee5e 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1227,13 +1227,17 @@ static void create_action(ITaskDefinition *taskdef) IExecAction *exec_action; hr = ITaskDefinition_get_Actions(taskdef, &actions); -todo_wine ok(hr == S_OK, "get_Actions error %#x\n", hr); - /* FIXME: Remove once implemented */ - if (hr != S_OK) return; hr = IActionCollection_Create(actions, TASK_ACTION_EXEC, &action); +todo_wine ok(hr == S_OK, "Create action error %#x\n", hr); + /* FIXME: Remove once implemented */ + if (hr != S_OK) + { + IActionCollection_Release(actions); + return; + } hr = IAction_QueryInterface(action, &IID_IExecAction, (void **)&exec_action); ok(hr == S_OK, "QueryInterface error %#x\n", hr); -- 2.11.0

1 0

[PATCH 3/8] taskschd: Implement ITaskDefinition_put_Principal.
by Hans Leidekker Nov. 30, 2017

Nov. 30, 2017

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 15 +++++++++++++-- dlls/taskschd/tests/scheduler.c | 3 +++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 185f5c2123..6828c987c0 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1879,8 +1879,19 @@ static HRESULT WINAPI TaskDefinition_get_Principal(ITaskDefinition *iface, IPrin static HRESULT WINAPI TaskDefinition_put_Principal(ITaskDefinition *iface, IPrincipal *principal) { - FIXME("%p,%p: stub\n", iface, principal); - return E_NOTIMPL; + TaskDefinition *taskdef = impl_from_ITaskDefinition(iface); + + TRACE("%p,%p\n", iface, principal); + + if (!principal) return E_POINTER; + + if (taskdef->principal) + IPrincipal_Release(taskdef->principal); + + IPrincipal_AddRef(principal); + taskdef->principal = principal; + + return S_OK; } static HRESULT WINAPI TaskDefinition_get_Actions(ITaskDefinition *iface, IActionCollection **actions) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index ad0755650e..244c28df01 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1173,6 +1173,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) hr = ITaskDefinition_get_Principal(taskdef, &principal); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(principal != NULL, "principal not set\n"); + + hr = ITaskDefinition_put_Principal(taskdef, principal); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); if (principal) IPrincipal_Release(principal); /* FIXME: set IIdleSettings and INetworkSettings */ -- 2.11.0

1 0

[PATCH 2/8] taskschd: Implement ITaskDefinition_get_Principal.
by Hans Leidekker Nov. 30, 2017

Nov. 30, 2017

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 221 ++++++++++++++++++++++++++++++++++++++-- dlls/taskschd/tests/scheduler.c | 7 ++ 2 files changed, 220 insertions(+), 8 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index d4e0d5688d..185f5c2123 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1446,6 +1446,196 @@ static HRESULT TaskSettings_create(ITaskSettings **obj) typedef struct { + IPrincipal IPrincipal_iface; + LONG ref; +} Principal; + +static inline Principal *impl_from_IPrincipal(IPrincipal *iface) +{ + return CONTAINING_RECORD(iface, Principal, IPrincipal_iface); +} + +static ULONG WINAPI Principal_AddRef(IPrincipal *iface) +{ + Principal *principal = impl_from_IPrincipal(iface); + return InterlockedIncrement(&principal->ref); +} + +static ULONG WINAPI Principal_Release(IPrincipal *iface) +{ + Principal *principal = impl_from_IPrincipal(iface); + LONG ref = InterlockedDecrement(&principal->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + heap_free(principal); + } + + return ref; +} + +static HRESULT WINAPI Principal_QueryInterface(IPrincipal *iface, REFIID riid, void **obj) +{ + if (!riid || !obj) return E_INVALIDARG; + + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IPrincipal) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IPrincipal_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static HRESULT WINAPI Principal_GetTypeInfoCount(IPrincipal *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_GetTypeInfo(IPrincipal *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_GetIDsOfNames(IPrincipal *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_Invoke(IPrincipal *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + params, result, excepinfo, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_get_Id(IPrincipal *iface, BSTR *id) +{ + FIXME("%p,%p: stub\n", iface, id); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_put_Id(IPrincipal *iface, BSTR id) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(id)); + return S_OK; +} + +static HRESULT WINAPI Principal_get_DisplayName(IPrincipal *iface, BSTR *name) +{ + FIXME("%p,%p: stub\n", iface, name); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_put_DisplayName(IPrincipal *iface, BSTR name) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(name)); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_get_UserId(IPrincipal *iface, BSTR *user_id) +{ + FIXME("%p,%p: stub\n", iface, user_id); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_put_UserId(IPrincipal *iface, BSTR user_id) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(user_id)); + return S_OK; +} + +static HRESULT WINAPI Principal_get_LogonType(IPrincipal *iface, TASK_LOGON_TYPE *logon_type) +{ + FIXME("%p,%p: stub\n", iface, logon_type); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_put_LogonType(IPrincipal *iface, TASK_LOGON_TYPE logon_type) +{ + FIXME("%p,%u: stub\n", iface, logon_type); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_get_GroupId(IPrincipal *iface, BSTR *group_id) +{ + FIXME("%p,%p: stub\n", iface, group_id); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_put_GroupId(IPrincipal *iface, BSTR group_id) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(group_id)); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_get_RunLevel(IPrincipal *iface, TASK_RUNLEVEL_TYPE *run_level) +{ + FIXME("%p,%p: stub\n", iface, run_level); + return E_NOTIMPL; +} + +static HRESULT WINAPI Principal_put_RunLevel(IPrincipal *iface, TASK_RUNLEVEL_TYPE run_level) +{ + FIXME("%p,%u: stub\n", iface, run_level); + return E_NOTIMPL; +} + +static const IPrincipalVtbl Principal_vtbl = +{ + Principal_QueryInterface, + Principal_AddRef, + Principal_Release, + Principal_GetTypeInfoCount, + Principal_GetTypeInfo, + Principal_GetIDsOfNames, + Principal_Invoke, + Principal_get_Id, + Principal_put_Id, + Principal_get_DisplayName, + Principal_put_DisplayName, + Principal_get_UserId, + Principal_put_UserId, + Principal_get_LogonType, + Principal_put_LogonType, + Principal_get_GroupId, + Principal_put_GroupId, + Principal_get_RunLevel, + Principal_put_RunLevel +}; + +static HRESULT Principal_create(IPrincipal **obj) +{ + Principal *principal; + + principal = heap_alloc(sizeof(*principal)); + if (!principal) return E_OUTOFMEMORY; + + principal->IPrincipal_iface.lpVtbl = &Principal_vtbl; + principal->ref = 1; + + *obj = &principal->IPrincipal_iface; + + TRACE("created %p\n", *obj); + + return S_OK; +} + +typedef struct +{ ITaskDefinition ITaskDefinition_iface; LONG ref; IRegistrationInfo *reginfo; @@ -1668,8 +1858,23 @@ static HRESULT WINAPI TaskDefinition_put_Data(ITaskDefinition *iface, BSTR data) static HRESULT WINAPI TaskDefinition_get_Principal(ITaskDefinition *iface, IPrincipal **principal) { - FIXME("%p,%p: stub\n", iface, principal); - return E_NOTIMPL; + TaskDefinition *taskdef = impl_from_ITaskDefinition(iface); + HRESULT hr; + + TRACE("%p,%p\n", iface, principal); + + if (!principal) return E_POINTER; + + if (!taskdef->principal) + { + hr = Principal_create(&taskdef->principal); + if (hr != S_OK) return hr; + } + + IPrincipal_AddRef(taskdef->principal); + *principal = taskdef->principal; + + return S_OK; } static HRESULT WINAPI TaskDefinition_put_Principal(ITaskDefinition *iface, IPrincipal *principal) @@ -1710,7 +1915,7 @@ static const WCHAR SecurityDescriptor[] = {'S','e','c','u','r','i','t','y','D',' static const WCHAR Settings[] = {'S','e','t','t','i','n','g','s',0}; static const WCHAR Triggers[] = {'T','r','i','g','g','e','r','s',0}; static const WCHAR Principals[] = {'P','r','i','n','c','i','p','a','l','s',0}; -static const WCHAR Principal[] = {'P','r','i','n','c','i','p','a','l',0}; +static const WCHAR principalW[] = {'P','r','i','n','c','i','p','a','l',0}; static const WCHAR id[] = {'i','d',0}; static const WCHAR UserId[] = {'U','s','e','r','I','d',0}; static const WCHAR LogonType[] = {'L','o','g','o','n','T','y','p','e',0}; @@ -1964,7 +2169,7 @@ static HRESULT write_principal(IStream *stream, IPrincipal *principal) { write_indent(stream); write_stringW(stream, start_element); - write_stringW(stream, Principal); + write_stringW(stream, principalW); write_stringW(stream, spaceW); write_stringW(stream, id); write_stringW(stream, equalW); @@ -1976,7 +2181,7 @@ static HRESULT write_principal(IStream *stream, IPrincipal *principal) SysFreeString(bstr); } else - write_element(stream, Principal); + write_element(stream, principalW); push_indent(); @@ -2054,7 +2259,7 @@ static HRESULT write_principal(IStream *stream, IPrincipal *principal) } pop_indent(); - write_element_end(stream, Principal); + write_element_end(stream, principalW); pop_indent(); return write_element_end(stream, Principals); @@ -2275,7 +2480,7 @@ static HRESULT read_principal(IXmlReader *reader, IPrincipal *principal) TRACE("/%s\n", debugstr_w(name)); - if (!lstrcmpW(name, Principal)) + if (!lstrcmpW(name, principalW)) return S_OK; break; @@ -2374,7 +2579,7 @@ static HRESULT read_principals(IXmlReader *reader, ITaskDefinition *taskdef) TRACE("Element: %s\n", debugstr_w(name)); - if (!lstrcmpW(name, Principal)) + if (!lstrcmpW(name, principalW)) { IPrincipal *principal; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index c58a5076bf..ad0755650e 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1095,6 +1095,7 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) HRESULT hr; ITaskSettings *set; ITriggerCollection *triggers; + IPrincipal *principal; hr = ITaskDefinition_get_Settings(taskdef, &set); ok(hr == S_OK, "get_Settings error %#x\n", hr); @@ -1168,6 +1169,12 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); if (triggers) ITriggerCollection_Release(triggers); + principal = NULL; + hr = ITaskDefinition_get_Principal(taskdef, &principal); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + ok(principal != NULL, "principal not set\n"); + if (principal) IPrincipal_Release(principal); + /* FIXME: set IIdleSettings and INetworkSettings */ ITaskSettings_Release(set); -- 2.11.0

1 0

[PATCH 1/8] taskschd: Implement ITaskDefinition_put_Triggers.
by Hans Leidekker Nov. 30, 2017

Nov. 30, 2017

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 15 +++++++++++++-- dlls/taskschd/tests/scheduler.c | 10 ++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 731c22d86b..d4e0d5688d 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1601,8 +1601,19 @@ static HRESULT WINAPI TaskDefinition_get_Triggers(ITaskDefinition *iface, ITrigg static HRESULT WINAPI TaskDefinition_put_Triggers(ITaskDefinition *iface, ITriggerCollection *triggers) { - FIXME("%p,%p: stub\n", iface, triggers); - return E_NOTIMPL; + TaskDefinition *taskdef = impl_from_ITaskDefinition(iface); + + TRACE("%p,%p\n", iface, triggers); + + if (!triggers) return E_POINTER; + + if (taskdef->triggers) + ITriggerCollection_Release(taskdef->triggers); + + ITriggerCollection_AddRef(triggers); + taskdef->triggers = triggers; + + return S_OK; } static HRESULT WINAPI TaskDefinition_get_Settings(ITaskDefinition *iface, ITaskSettings **settings) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 07083afcd3..c58a5076bf 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1094,6 +1094,7 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) { HRESULT hr; ITaskSettings *set; + ITriggerCollection *triggers; hr = ITaskDefinition_get_Settings(taskdef, &set); ok(hr == S_OK, "get_Settings error %#x\n", hr); @@ -1158,6 +1159,15 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) hr = ITaskSettings_put_AllowDemandStart(set, test->allow_on_demand_start); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + triggers = NULL; + hr = ITaskDefinition_get_Triggers(taskdef, &triggers); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + ok(triggers != NULL, "triggers not set\n"); + + hr = ITaskDefinition_put_Triggers(taskdef, triggers); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + if (triggers) ITriggerCollection_Release(triggers); + /* FIXME: set IIdleSettings and INetworkSettings */ ITaskSettings_Release(set); -- 2.11.0

1 0

[PATCH v2] configure: Remove l_intl.nls before removing created directories.
by Zebediah Figura Nov. 30, 2017

Nov. 30, 2017

Fixes a bug where running 'make uninstall' would leave behind an empty wine/ directory. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: add .PHONY configure.ac | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index dd19098..5c43aed 100644 --- a/configure.ac +++ b/configure.ac @@ -3906,8 +3906,10 @@ else WINE_APPEND_RULE( [install install-lib:: \$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls -uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls]) +.PHONY: l_intl.nls/uninstall +l_intl.nls/uninstall:: + \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls +__uninstall__: l_intl.nls/uninstall]) case $host_os in cygwin*|mingw32*|darwin*|macosx*|linux-android*) ;; *) WINE_APPEND_RULE( -- 2.7.4

1 0

[PATCH] configure: Remove l_intl.nls before removing created directories.
by Zebediah Figura Nov. 30, 2017

Nov. 30, 2017

Fixes a bug where running 'make uninstall' would leave behind an empty wine/ directory. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index dd19098..3db65e3 100644 --- a/configure.ac +++ b/configure.ac @@ -3906,8 +3906,9 @@ else WINE_APPEND_RULE( [install install-lib:: \$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls -uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls]) +l_intl.nls/uninstall:: + \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls +__uninstall__: l_intl.nls/uninstall]) case $host_os in cygwin*|mingw32*|darwin*|macosx*|linux-android*) ;; *) WINE_APPEND_RULE( -- 2.7.4

1 0

[PATCH 2/2] mlang: Fix font name of code page families.
by Ziqing Hui Nov. 30, 2017

Nov. 30, 2017

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/mlang/mlang.c | 24 ++++++++++++------------ dlls/mlang/tests/mlang.c | 18 ++++++------------ 2 files changed, 18 insertions(+), 24 deletions(-)

1 0

[PATCH 1/2] mlang/tests: Add a test code page for each code page family.
by Ziqing Hui Nov. 30, 2017

Nov. 30, 2017

These test data are added to prove that the changes of font names in the next patch is correct. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/mlang/tests/mlang.c | 193 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 193 insertions(+)

1 0

[PATCH 1/4] shell32: Add a parser for DDE commands.
by Zebediah Figura Nov. 29, 2017

Nov. 29, 2017

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/shell32/dde.c | 115 +++++++++++++++++++++++++++++++++++++++++--- dlls/shell32/shell32_main.h | 13 +++++ 2 files changed, 121 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index c44f05d..ae1143b 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -26,7 +26,10 @@ #include "ddeml.h" #include "shellapi.h" +#include "shell32_main.h" + #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -94,21 +97,119 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, return NULL; } -static inline DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata) +static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) { - WCHAR * pszCommand; + FIXME("unhandled command %s\n", debugstr_w(command)); + return DDE_FNOTPROCESSED; +} + +static DWORD parse_dde_command(HSZ hszTopic, WCHAR *command) +{ + static const WCHAR opcode_end[] = {' ',',','(',')','[',']','"',0}; + static const WCHAR param_end[] = {',','(',')','[',']',0}; + + WCHAR *original = command; + WCHAR *opcode = NULL, **argv = NULL, *p; + int argc = 0, i; + DWORD ret = DDE_FACK; + + while (*command == ' ') command++; + + if (*command != '[') goto error; + while (*command == '[') + { + argc = 0; + argv = HeapAlloc(GetProcessHeap(), 0, sizeof(*argv)); + + command++; + while (*command == ' ') command++; + if (!(p = strpbrkW(command, opcode_end))) goto error; + + opcode = strndupW(command, p - command); + + command = p; + while (*command == ' ') command++; + if (*command == '(') + { + command++; + + while (*command != ')') + { + while (*command == ' ') command++; + if (*command == '"') + { + command++; + if (!(p = strchrW(command, '"'))) goto error; + } + else + { + if (!(p = strpbrkW(command, param_end))) goto error; + while (p[-1] == ' ') p--; + } - pszCommand = (WCHAR *)DdeAccessData(hdata, NULL); - if (!pszCommand) - return DDE_FNOTPROCESSED; + argc++; + argv = HeapReAlloc(GetProcessHeap(), 0, argv, argc * sizeof(*argv)); + argv[argc-1] = strndupW(command, p - command); - FIXME("stub: %s %s\n", debugstr_hsz(hszTopic), debugstr_w(pszCommand)); + command = p; + if (*command == '"') command++; + while (*command == ' ') command++; + if (*command == ',') command++; + else if (*command != ')') goto error; + } + command++; - DdeUnaccessData(hdata); + while (*command == ' ') command++; + } + if (*command != ']') goto error; + command++; + while (*command == ' ') command++; + + if (hszTopic == hszProgmanTopic) + ret = PROGMAN_OnExecute(opcode, argc, argv); + else + { + FIXME("unhandled topic %s, command %s\n", debugstr_hsz(hszTopic), debugstr_w(opcode)); + ret = DDE_FNOTPROCESSED; + } + + HeapFree(GetProcessHeap(), 0, opcode); + for (i = 0; i < argc; i++) HeapFree(GetProcessHeap(), 0, argv[i]); + HeapFree(GetProcessHeap(), 0, argv); + + if (ret == DDE_FNOTPROCESSED) break; + } + + return ret; + +error: + ERR("failed to parse command %s\n", debugstr_w(original)); + HeapFree(GetProcessHeap(), 0, opcode); + for (i = 0; i < argc; i++) HeapFree(GetProcessHeap(), 0, argv[i]); + HeapFree(GetProcessHeap(), 0, argv); return DDE_FNOTPROCESSED; } +static DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata) +{ + WCHAR *command; + DWORD len; + DWORD ret; + + len = DdeGetData(hdata, NULL, 0, 0); + if (!len) return DDE_FNOTPROCESSED; + command = HeapAlloc(GetProcessHeap(), 0, len); + DdeGetData(hdata, (BYTE *)command, len, 0); + + TRACE("conv=%p topic=%s data=%s\n", hconv, debugstr_hsz(hszTopic), debugstr_w(command)); + + ret = parse_dde_command(hszTopic, command); + + HeapFree(GetProcessHeap(), 0, command); + return ret; +} + static inline void Dde_OnDisconnect(HCONV hconv) { TRACE( "%p\n", hconv ); diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 368c0e0..b65141f 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -238,6 +238,19 @@ static inline WCHAR *strdupW(const WCHAR *src) return dest; } +static inline WCHAR *strndupW(const WCHAR *src, DWORD len) +{ + WCHAR *dest; + if (!src) return NULL; + dest = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(*dest)); + if (dest) + { + memcpy(dest, src, len * sizeof(WCHAR)); + dest[len] = '\0'; + } + return dest; +} + static inline WCHAR *strdupAtoW(const char *str) { WCHAR *ret; -- 2.7.4

1 3

[PATCH 1/3] ntdll: NtReadFileScatter always returns asynchronously
by Andrew Eikum Nov. 29, 2017

Nov. 29, 2017

This patch sequence fixes Wolfenstein II, Bug 43935. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 28 ++++++++++++++++++++-------- dlls/ntdll/file.c | 4 +++- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 0b8cef23f8..44fbf7a4b1 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4353,7 +4353,8 @@ static void test_WriteFileGather(void) FILE_SEGMENT_ELEMENT fse[2]; OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; - LPVOID buf = NULL; + BOOL br; + char *wbuf = NULL, *rbuf1; ret = GetTempPathA( MAX_PATH, temp_path ); ok( ret != 0, "GetTempPathA error %d\n", GetLastError() ); @@ -4371,12 +4372,16 @@ static void test_WriteFileGather(void) ok( hiocp2 != 0, "CreateIoCompletionPort failed err %u\n", GetLastError() ); GetSystemInfo( &si ); - buf = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); - ok( buf != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + wbuf = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( wbuf != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + + rbuf1 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( rbuf1 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); memset( &ovl, 0, sizeof(ovl) ); memset( fse, 0, sizeof(fse) ); - fse[0].Buffer = buf; + memset( wbuf, 0x42, si.dwPageSize ); + fse[0].Buffer = wbuf; if (!WriteFileGather( hfile, fse, si.dwPageSize, NULL, &ovl )) ok( GetLastError() == ERROR_IO_PENDING, "WriteFileGather failed err %u\n", GetLastError() ); @@ -4384,20 +4389,27 @@ static void test_WriteFileGather(void) ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError()); ok( povl == &ovl, "wrong ovl %p\n", povl ); + /* read exact size */ memset( &ovl, 0, sizeof(ovl) ); memset( fse, 0, sizeof(fse) ); - fse[0].Buffer = buf; - if (!ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl )) - ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + fse[0].Buffer = rbuf1; + memset( rbuf1, 0, si.dwPageSize ); + br = ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError()); ok( povl == &ovl, "wrong ovl %p\n", povl ); + ok( memcmp( rbuf1, wbuf, si.dwPageSize ) == 0, + "data was not read into buffer\n" ); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); - VirtualFree( buf, 0, MEM_RELEASE ); + VirtualFree( wbuf, 0, MEM_RELEASE ); + VirtualFree( rbuf1, 0, MEM_RELEASE ); DeleteFileA( filename ); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index ca2afa0e89..bdfc383d7e 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1090,7 +1090,9 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap if (needs_close) close( unix_handle ); if (status == STATUS_SUCCESS) { - io_status->u.Status = status; + /* report status asynchronously */ + status = STATUS_PENDING; + io_status->u.Status = STATUS_SUCCESS; io_status->Information = total; TRACE("= SUCCESS (%u)\n", total); if (event) NtSetEvent( event, NULL ); -- 2.15.0

2 1

[PATCH 3/3] ntdll: Don't require full-page reads in NtReadFileScatter
by Andrew Eikum Nov. 29, 2017

Nov. 29, 2017

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 19 +++++++++++++++++++ dlls/ntdll/file.c | 5 ++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index e1cf268817..a3d6e8f71e 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4429,6 +4429,25 @@ static void test_WriteFileGather(void) ok( memcmp( rbuf2, rbuf1, si.dwPageSize ) == 0, "data should not have been read into buffer\n" ); + /* partial page read */ + memset( &ovl, 0, sizeof(ovl) ); + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + memset( rbuf1, 0, si.dwPageSize ); + br = ReadFileScatter( hfile, fse, si.dwPageSize / 2, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + + ok( memcmp( rbuf1, wbuf, si.dwPageSize / 2 ) == 0, + "invalid data was read into buffer\n" ); + memset( rbuf2, 0, si.dwPageSize ); + ok( memcmp( rbuf1 + si.dwPageSize / 2, rbuf2, si.dwPageSize - si.dwPageSize / 2 ) == 0, + "invalid data was read into buffer\n" ); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index f7db24cc8b..152ad7498c 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1041,7 +1041,6 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap TRACE( "(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n", file, event, apc, apc_user, io_status, segments, length, offset, key); - if (length % page_size) return STATUS_INVALID_PARAMETER; if (!io_status) return STATUS_ACCESS_VIOLATION; status = server_get_unix_fd( file, FILE_READ_DATA, &unix_handle, @@ -1060,9 +1059,9 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap { if (offset && offset->QuadPart != FILE_USE_FILE_POINTER_POSITION) result = pread( unix_handle, (char *)segments->Buffer + pos, - page_size - pos, offset->QuadPart + total ); + min( length - pos, page_size - pos ), offset->QuadPart + total ); else - result = read( unix_handle, (char *)segments->Buffer + pos, page_size - pos ); + result = read( unix_handle, (char *)segments->Buffer + pos, min( length - pos, page_size - pos ) ); if (result == -1) { -- 2.15.0

1 0

[PATCH] v2: shell32: add stub for Shell_NotifyIconGetRect
by Louis Lenders Nov. 29, 2017

Nov. 29, 2017

v2: - removed SetLastError (ERROR_CALL_NOT_IMPLEMENTED) - corrected prototype for Shell_NotifyIconGetRect in shellapi.h

1 0

[PATCH] wininet: Use case-insensitive comparison for server name.
by Daniel Lehman Nov. 29, 2017

Nov. 29, 2017

2 1

[PATCH 2/2] ole32/tests: Show that the storage's CLSID is not modified when saving.
by Huw Davies Nov. 29, 2017

Nov. 29, 2017

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/tests/ole2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 88ad207521..ca6756a6e5 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4194,7 +4194,7 @@ static void test_data_cache_save_data(void) }, 1, 1, &CLSID_WineTest, { - &CLSID_WineTest, 1, { { "\2OlePres000", CF_DIB, DVASPECT_CONTENT, 0, NULL, 0 } } + &CLSID_WineTestOld, 1, { { "\2OlePres000", CF_DIB, DVASPECT_CONTENT, 0, NULL, 0 } } } }, { @@ -4203,7 +4203,7 @@ static void test_data_cache_save_data(void) }, 1, 1, &CLSID_WineTest, { - &CLSID_WineTest, 1, { { "\2OlePres000", CF_METAFILEPICT, DVASPECT_CONTENT, 0, NULL, 0 } } + &CLSID_WineTestOld, 1, { { "\2OlePres000", CF_METAFILEPICT, DVASPECT_CONTENT, 0, NULL, 0 } } } }, { @@ -4238,7 +4238,7 @@ static void test_data_cache_save_data(void) hr = StgCreateDocfileOnILockBytes(ilb, STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &doc); ok(hr == S_OK, "unexpected %#x\n", hr); ILockBytes_Release(ilb); - hr = IStorage_SetClass(doc, pdata->clsid); + hr = IStorage_SetClass(doc, &CLSID_WineTestOld); ok(hr == S_OK, "unexpected %#x\n", hr); hr = IOleCache2_QueryInterface(cache, &IID_IPersistStorage, (void **)&persist); -- 2.12.0

1 0

[PATCH 1/2] ole32: Make the synthesize helpers return a STGMEDIUM.
by Huw Davies Nov. 29, 2017

Nov. 29, 2017

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/datacache.c | 61 +++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index da7a536835..c550c75cd3 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -958,12 +958,12 @@ static HRESULT copy_stg_medium(CLIPFORMAT cf, STGMEDIUM *dest_stgm, return S_OK; } -static HGLOBAL synthesize_dib( HBITMAP bm ) +static HRESULT synthesize_dib( HBITMAP bm, STGMEDIUM *med ) { HDC hdc = GetDC( 0 ); BITMAPINFOHEADER header; BITMAPINFO *bmi; - HGLOBAL ret = 0; + HRESULT hr = E_FAIL; DWORD header_size; memset( &header, 0, sizeof(header) ); @@ -971,55 +971,64 @@ static HGLOBAL synthesize_dib( HBITMAP bm ) if (!GetDIBits( hdc, bm, 0, 0, NULL, (BITMAPINFO *)&header, DIB_RGB_COLORS )) goto done; header_size = bitmap_info_size( (BITMAPINFO *)&header, DIB_RGB_COLORS ); - if (!(ret = GlobalAlloc( GMEM_MOVEABLE, header_size + header.biSizeImage ))) goto done; - bmi = GlobalLock( ret ); + if (!(med->u.hGlobal = GlobalAlloc( GMEM_MOVEABLE, header_size + header.biSizeImage ))) goto done; + bmi = GlobalLock( med->u.hGlobal ); memset( bmi, 0, header_size ); memcpy( bmi, &header, header.biSize ); GetDIBits( hdc, bm, 0, abs(header.biHeight), (char *)bmi + header_size, bmi, DIB_RGB_COLORS ); - GlobalUnlock( ret ); + GlobalUnlock( med->u.hGlobal ); + med->tymed = TYMED_HGLOBAL; + med->pUnkForRelease = NULL; + hr = S_OK; done: ReleaseDC( 0, hdc ); - return ret; + return hr; } -static HBITMAP synthesize_bitmap( HGLOBAL dib ) +static HRESULT synthesize_bitmap( HGLOBAL dib, STGMEDIUM *med ) { - HBITMAP ret = 0; + HRESULT hr = E_FAIL; BITMAPINFO *bmi; HDC hdc = GetDC( 0 ); if ((bmi = GlobalLock( dib ))) { /* FIXME: validate data size */ - ret = CreateDIBitmap( hdc, &bmi->bmiHeader, CBM_INIT, - (char *)bmi + bitmap_info_size( bmi, DIB_RGB_COLORS ), - bmi, DIB_RGB_COLORS ); + med->u.hBitmap = CreateDIBitmap( hdc, &bmi->bmiHeader, CBM_INIT, + (char *)bmi + bitmap_info_size( bmi, DIB_RGB_COLORS ), + bmi, DIB_RGB_COLORS ); GlobalUnlock( dib ); + med->tymed = TYMED_GDI; + med->pUnkForRelease = NULL; + hr = S_OK; } ReleaseDC( 0, hdc ); - return ret; + return hr; } -static HENHMETAFILE synthesize_emf( HMETAFILEPICT data ) +static HRESULT synthesize_emf( HMETAFILEPICT data, STGMEDIUM *med ) { METAFILEPICT *pict; - HENHMETAFILE emf = 0; + HRESULT hr = E_FAIL; UINT size; void *bits; - if (!(pict = GlobalLock( data ))) return 0; + if (!(pict = GlobalLock( data ))) return hr; size = GetMetaFileBitsEx( pict->hMF, 0, NULL ); if ((bits = HeapAlloc( GetProcessHeap(), 0, size ))) { GetMetaFileBitsEx( pict->hMF, size, bits ); - emf = SetWinMetaFileBits( size, bits, NULL, pict ); + med->u.hEnhMetaFile = SetWinMetaFileBits( size, bits, NULL, pict ); HeapFree( GetProcessHeap(), 0, bits ); + med->tymed = TYMED_ENHMF; + med->pUnkForRelease = NULL; + hr = S_OK; } GlobalUnlock( data ); - return emf; + return hr; } static HRESULT DataCacheEntry_SetData(DataCacheEntry *cache_entry, @@ -1028,6 +1037,7 @@ static HRESULT DataCacheEntry_SetData(DataCacheEntry *cache_entry, BOOL fRelease) { STGMEDIUM copy; + HRESULT hr; if ((!cache_entry->fmtetc.cfFormat && !formatetc->cfFormat) || (cache_entry->fmtetc.tymed == TYMED_NULL && formatetc->tymed == TYMED_NULL) || @@ -1042,17 +1052,16 @@ static HRESULT DataCacheEntry_SetData(DataCacheEntry *cache_entry, if (formatetc->cfFormat == CF_BITMAP) { - copy.tymed = TYMED_HGLOBAL; - copy.u.hGlobal = synthesize_dib( stgmedium->u.hBitmap ); - copy.pUnkForRelease = NULL; + hr = synthesize_dib( stgmedium->u.hBitmap, &copy ); + if (FAILED(hr)) return hr; if (fRelease) ReleaseStgMedium(stgmedium); stgmedium = © fRelease = TRUE; } else if (formatetc->cfFormat == CF_METAFILEPICT && cache_entry->fmtetc.cfFormat == CF_ENHMETAFILE) { - copy.tymed = TYMED_ENHMF; - copy.u.hEnhMetaFile = synthesize_emf( stgmedium->u.hMetaFilePict ); + hr = synthesize_emf( stgmedium->u.hMetaFilePict, &copy ); + if (FAILED(hr)) return hr; if (fRelease) ReleaseStgMedium(stgmedium); stgmedium = © fRelease = TRUE; @@ -1079,12 +1088,8 @@ static HRESULT DataCacheEntry_GetData(DataCacheEntry *cache_entry, FORMATETC *fm return OLE_E_BLANK; if (fmt->cfFormat == CF_BITMAP) - { - stgmedium->tymed = TYMED_GDI; - stgmedium->u.hBitmap = synthesize_bitmap( cache_entry->stgmedium.u.hGlobal ); - stgmedium->pUnkForRelease = NULL; - return S_OK; - } + return synthesize_bitmap( cache_entry->stgmedium.u.hGlobal, stgmedium ); + return copy_stg_medium(cache_entry->fmtetc.cfFormat, stgmedium, &cache_entry->stgmedium); } -- 2.12.0

1 0