November 2017 - Wine-commits

Hans Leidekker : taskschd: Implement IActionCollection_Create.
by Alexandre Julliard 30 Nov '17

30 Nov '17

Module: wine Branch: master Commit: 8d739937d336f78cd34e8aa8a873f89a43ca274c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d739937d336f78cd34e8aa8a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 30 09:37:09 2017 +0100 taskschd: Implement IActionCollection_Create. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 1c20f83..f32d3d2 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 1df79d5..22854d9 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);

1 0

Hans Leidekker : taskschd: Implement IExecAction_put_Path.
by Alexandre Julliard 30 Nov '17

30 Nov '17

Module: wine Branch: master Commit: e0fbe82e66834afb2a57f6bdeec955616fd84aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0fbe82e66834afb2a57f6bde… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 30 09:37:10 2017 +0100 taskschd: Implement IExecAction_put_Path. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 f32d3d2..01e7c2d 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;

1 0

Hans Leidekker : taskschd: Implement IExecAction_get_Path.
by Alexandre Julliard 30 Nov '17

30 Nov '17

Module: wine Branch: master Commit: 0d3ebfc45981e7d61522c44ff91f9b8748ca5c60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d3ebfc45981e7d61522c44ff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 30 09:37:11 2017 +0100 taskschd: Implement IExecAction_get_Path. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 01e7c2d..df75236 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 22854d9..c7de7c7 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);

1 0

Alexandre Julliard : ntdll: Suspend a thread with its start context explicitly before attaching dlls.
by Alexandre Julliard 30 Nov '17

30 Nov '17

Module: wine Branch: master Commit: 6c61ea6a13eae35429f48b07d32fc5a67e3b5833 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c61ea6a13eae35429f48b07d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 30 11:01:47 2017 +0100 ntdll: Suspend a thread with its start context explicitly before attaching dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 4 ++-- dlls/ntdll/server.c | 3 ++- dlls/ntdll/signal_arm.c | 12 +++++++++++- dlls/ntdll/signal_arm64.c | 12 +++++++++++- dlls/ntdll/signal_i386.c | 20 +++++++++++++++++++- dlls/ntdll/signal_powerpc.c | 12 +++++++++++- dlls/ntdll/signal_x86_64.c | 15 ++++++++++++++- dlls/ntdll/thread.c | 8 +++++--- include/wine/server_protocol.h | 4 ++-- server/protocol.def | 1 + server/request.h | 1 + server/thread.c | 2 +- server/trace.c | 1 + 13 files changed, 81 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c61ea6a13eae35429f48…

1 0

Alexandre Julliard : ntdll: Don't return from attach_dlls on failure.
by Alexandre Julliard 30 Nov '17

30 Nov '17

Module: wine Branch: master Commit: 70b69f3e5fb964e08a77de936dbf5bb49f4afabf URL: http://source.winehq.org/git/wine.git/?a=commit;h=70b69f3e5fb964e08a77de936… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 30 16:00:14 2017 +0100 ntdll: Don't return from attach_dlls on failure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 39 +++++++++++++++++++++++++-------------- dlls/ntdll/ntdll_misc.h | 6 +++--- dlls/ntdll/server.c | 6 +++--- dlls/ntdll/signal_arm.c | 20 +++++++------------- dlls/ntdll/signal_arm64.c | 20 +++++++------------- dlls/ntdll/signal_i386.c | 25 ++++++++----------------- dlls/ntdll/signal_powerpc.c | 20 +++++++------------- dlls/ntdll/signal_x86_64.c | 25 ++++++++----------------- dlls/ntdll/thread.c | 4 +--- 9 files changed, 69 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70b69f3e5fb964e08a77d…

1 0

Alexandre Julliard : kernel32/tests: Add a test for the thread initial context.
by Alexandre Julliard 30 Nov '17

30 Nov '17

Module: wine Branch: master Commit: b802f88319969fc5c71807ec8b695b0256bdf35c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b802f88319969fc5c71807ec8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 30 12:25:58 2017 +0100 kernel32/tests: Add a test for the thread initial context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 44 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 6790185..07067ab 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3036,6 +3036,7 @@ static void test_SuspendProcessNewThread(void) IMAGE_NT_HEADERS nt_header; HANDLE thread_handle = NULL; DWORD exit_code = 0; + CONTEXT ctx; exit_thread_ptr = GetProcAddress(hkernel32, "ExitThread"); ok(exit_thread_ptr != NULL, "GetProcAddress ExitThread failed\n"); @@ -3052,9 +3053,50 @@ static void test_SuspendProcessNewThread(void) thread_handle = CreateRemoteThread(pi.hProcess, NULL, 0, (LPTHREAD_START_ROUTINE)exit_thread_ptr, - (PVOID)(ULONG_PTR)0x1234, 0, NULL); + (PVOID)(ULONG_PTR)0x1234, CREATE_SUSPENDED, NULL); ok(thread_handle != NULL, "Could not create remote thread (%d)\n", GetLastError()); + ret = are_imports_resolved(pi.hProcess, exe_base, &nt_header); + ok(!ret, "IAT entry resolved prematurely\n"); + + ctx.ContextFlags = CONTEXT_FULL; + ret = GetThreadContext( thread_handle, &ctx ); + ok( ret, "Failed retrieving remote thread context (%d)\n", GetLastError() ); +#ifdef __x86_64__ + ok( ctx.ContextFlags == CONTEXT_FULL, "wrong flags %x\n", ctx.ContextFlags ); + ok( !ctx.Rax, "rax is not zero %lx\n", ctx.Rax ); + ok( !ctx.Rbx, "rbx is not zero %lx\n", ctx.Rbx ); + ok( ctx.Rcx == (ULONG_PTR)exit_thread_ptr, "wrong rcx %lx/%p\n", ctx.Rcx, exit_thread_ptr ); + ok( ctx.Rdx == 0x1234, "wrong rdx %lx\n", ctx.Rdx ); + ok( !ctx.Rsi, "rsi is not zero %lx\n", ctx.Rsi ); + ok( !ctx.Rdi, "rdi is not zero %lx\n", ctx.Rdi ); + ok( !ctx.Rbp, "rbp is not zero %lx\n", ctx.Rbp ); + ok( !ctx.R8, "r8 is not zero %lx\n", ctx.R8 ); + ok( !ctx.R9, "r9 is not zero %lx\n", ctx.R9 ); + ok( !ctx.R10, "r10 is not zero %lx\n", ctx.R10 ); + ok( !ctx.R11, "r11 is not zero %lx\n", ctx.R11 ); + ok( !ctx.R12, "r12 is not zero %lx\n", ctx.R12 ); + ok( !ctx.R13, "r13 is not zero %lx\n", ctx.R13 ); + ok( !ctx.R14, "r14 is not zero %lx\n", ctx.R14 ); + ok( !ctx.R15, "r15 is not zero %lx\n", ctx.R15 ); + ok( !((ctx.Rsp + 0x28) & 0xfff), "rsp is not at top of stack page %lx\n", ctx.Rsp ); +#else + ok( ctx.ContextFlags == CONTEXT_FULL, "wrong flags %x\n", ctx.ContextFlags ); + ok( !ctx.Ebp || broken(ctx.Ebp), /* winxp */ "ebp is not zero %08x\n", ctx.Ebp ); + if (!ctx.Ebp) /* winxp is completely different */ + { + ok( !ctx.Ecx, "ecx is not zero %08x\n", ctx.Ecx ); + ok( !ctx.Edx, "edx is not zero %08x\n", ctx.Edx ); + ok( !ctx.Esi, "esi is not zero %08x\n", ctx.Esi ); + ok( !ctx.Edi, "edi is not zero %08x\n", ctx.Edi ); + } + ok( ctx.Eax == (ULONG_PTR)exit_thread_ptr, "wrong eax %08x/%p\n", ctx.Eax, exit_thread_ptr ); + ok( ctx.Ebx == 0x1234, "wrong ebx %08x\n", ctx.Ebx ); + ok( !((ctx.Esp + 0x10) & 0xfff) || broken( !((ctx.Esp + 4) & 0xfff) ), /* winxp, w2k3 */ + "esp is not at top of stack page or properly aligned: %08x\n", ctx.Esp ); +#endif + + ResumeThread( thread_handle ); ok(WaitForSingleObject(thread_handle, 60000) == WAIT_OBJECT_0, "Waiting for remote thread failed (%d)\n", GetLastError()); ok(GetExitCodeThread(thread_handle, &exit_code), "Failed to retrieve remote thread exit code (%d)\n", GetLastError()); ok(exit_code == 0x1234, "Invalid remote thread exit code\n");

1 0

Andrew Eikum : xaudio2: Ignore buffers returned from OpenAL after Stop.
by Alexandre Julliard 30 Nov '17

30 Nov '17

Module: wine Branch: master Commit: e2c73fc394bace00c4463b6fcb6dfe9dc64084bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2c73fc394bace00c4463b6fc… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Nov 30 08:01:53 2017 -0600 xaudio2: Ignore buffers returned from OpenAL after Stop. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/tests/xaudio2.c | 78 ++++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_dll.c | 79 +++++++++++++++++++++++++---------------- dlls/xaudio2_7/xaudio_private.h | 2 +- 3 files changed, 128 insertions(+), 31 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 54176ea..ff402f8 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 13f5916..8f15ded 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; - - alGetBufferi(al_buffers[i], AL_SIZE, &bufsize); + if(processed > src->abandoned_albufs){ + for(i = src->abandoned_albufs; i < processed; ++i){ + ALint bufsize; - src->in_al_bytes -= bufsize; - src->played_frames += bufsize / src->submit_blocksize; + alGetBufferi(al_buffers[i], AL_SIZE, &bufsize); - if(al_buffers[i] == src->buffers[src->first_buf].latest_al_buf){ - DWORD old_buf = src->first_buf; + src->in_al_bytes -= bufsize; + src->played_frames += bufsize / src->submit_blocksize; - src->first_buf++; - src->first_buf %= XAUDIO2_MAX_QUEUED_BUFFERS; - src->nbufs--; + if(al_buffers[i] == src->buffers[src->first_buf].latest_al_buf){ + DWORD old_buf = src->first_buf; - TRACE("%p: done with buffer %u\n", src, old_buf); + src->first_buf++; + src->first_buf %= XAUDIO2_MAX_QUEUED_BUFFERS; + src->nbufs--; - if(src->buffers[old_buf].xa2buffer.Flags & XAUDIO2_END_OF_STREAM) - src->played_frames = 0; + TRACE("%p: done with buffer %u\n", src, old_buf); - 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->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); + + 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 f28a0ae..1a4aa08 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;

1 0

Jacek Caban : mshtml: Removed unused impl_from_DispatchEx.
by Alexandre Julliard 30 Nov '17

30 Nov '17

Module: wine Branch: master Commit: dda20ef4ec9d0db3354789b525a079db44cb17bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=dda20ef4ec9d0db3354789b52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 30 16:09:37 2017 +0100 mshtml: Removed unused impl_from_DispatchEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 0b9a36b..3b8820e 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2051,11 +2051,6 @@ static inline EventTarget *impl_from_IEventTarget(IEventTarget *iface) return CONTAINING_RECORD(iface, EventTarget, IEventTarget_iface); } -static inline EventTarget *impl_from_DispatchEx(DispatchEx *iface) -{ - return CONTAINING_RECORD(iface, EventTarget, dispex); -} - static HRESULT WINAPI EventTarget_QueryInterface(IEventTarget *iface, REFIID riid, void **ppv) { EventTarget *This = impl_from_IEventTarget(iface);

1 0

Jacek Caban : mshtml: Store listener container type as a string.
by Alexandre Julliard 30 Nov '17

30 Nov '17

Module: wine Branch: master Commit: 26f731f4a03519456ddc157fe6200be4c0ee323a URL: http://source.winehq.org/git/wine.git/?a=commit;h=26f731f4a03519456ddc157fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 30 16:10:50 2017 +0100 mshtml: Store listener container type as a string. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 3b8820e..860c361 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -50,8 +50,8 @@ typedef struct { typedef struct { struct wine_rb_entry entry; - eventid_t event_id; struct list listeners; + WCHAR type[1]; } listener_container_t; static const WCHAR abortW[] = {'a','b','o','r','t',0}; @@ -242,8 +242,9 @@ static listener_container_t *get_listener_container(EventTarget *event_target, e const event_target_vtbl_t *vtbl; listener_container_t *container; struct wine_rb_entry *entry; + size_t type_len; - entry = wine_rb_get(&event_target->handler_map, (const void*)eid); + entry = wine_rb_get(&event_target->handler_map, event_info[eid].name); if(entry) return WINE_RB_ENTRY_VALUE(entry, listener_container_t, entry); if(!alloc) @@ -252,11 +253,11 @@ static listener_container_t *get_listener_container(EventTarget *event_target, e if(event_info[eid].flags & EVENT_FIXME) FIXME("unimplemented event %s\n", debugstr_w(event_info[eid].name)); - container = heap_alloc(sizeof(*container)); + type_len = strlenW(event_info[eid].name); + container = heap_alloc(FIELD_OFFSET(listener_container_t, type[type_len+1])); if(!container) return NULL; - - container->event_id = eid; + memcpy(container->type, event_info[eid].name, (type_len + 1) * sizeof(WCHAR)); list_init(&container->listeners); vtbl = dispex_get_vtbl(&event_target->dispex); if(vtbl->bind_event) @@ -264,7 +265,7 @@ static listener_container_t *get_listener_container(EventTarget *event_target, e else FIXME("Unsupported event binding on target %p\n", event_target); - wine_rb_put(&event_target->handler_map, (const void*)eid, &container->entry); + wine_rb_put(&event_target->handler_map, container->type, &container->entry); return container; } @@ -2264,7 +2265,7 @@ void EventTarget_init_dispex_info(dispex_data_t *dispex_info, compat_mode_t comp static int event_id_cmp(const void *key, const struct wine_rb_entry *entry) { - return (INT_PTR)key - WINE_RB_ENTRY_VALUE(entry, listener_container_t, entry)->event_id; + return strcmpW(key, WINE_RB_ENTRY_VALUE(entry, listener_container_t, entry)->type); } void EventTarget_Init(EventTarget *event_target, IUnknown *outer, dispex_static_data_t *dispex_data,

1 0

Jacek Caban : mshtml: Pass listener type as a string to get_listener_container.
by Alexandre Julliard 30 Nov '17

30 Nov '17

Module: wine Branch: master Commit: ebefab4b0383bacb6e5469439f73dae3dcd2ae64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebefab4b0383bacb6e5469439… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 30 16:11:01 2017 +0100 mshtml: Pass listener type as a string to get_listener_container. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 860c361..e0ee269 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -237,27 +237,29 @@ static eventid_t attr_to_eid(const WCHAR *str) return EVENTID_LAST; } -static listener_container_t *get_listener_container(EventTarget *event_target, eventid_t eid, BOOL alloc) +static listener_container_t *get_listener_container(EventTarget *event_target, const WCHAR *type, BOOL alloc) { const event_target_vtbl_t *vtbl; listener_container_t *container; struct wine_rb_entry *entry; size_t type_len; + eventid_t eid; - entry = wine_rb_get(&event_target->handler_map, event_info[eid].name); + entry = wine_rb_get(&event_target->handler_map, type); if(entry) return WINE_RB_ENTRY_VALUE(entry, listener_container_t, entry); if(!alloc) return NULL; - if(event_info[eid].flags & EVENT_FIXME) + eid = str_to_eid(type); + if(eid != EVENTID_LAST && (event_info[eid].flags & EVENT_FIXME)) FIXME("unimplemented event %s\n", debugstr_w(event_info[eid].name)); - type_len = strlenW(event_info[eid].name); + type_len = strlenW(type); container = heap_alloc(FIELD_OFFSET(listener_container_t, type[type_len+1])); if(!container) return NULL; - memcpy(container->type, event_info[eid].name, (type_len + 1) * sizeof(WCHAR)); + memcpy(container->type, type, (type_len + 1) * sizeof(WCHAR)); list_init(&container->listeners); vtbl = dispex_get_vtbl(&event_target->dispex); if(vtbl->bind_event) @@ -274,7 +276,7 @@ static void remove_event_listener(EventTarget *event_target, eventid_t eid, list listener_container_t *container; event_listener_t *listener; - container = get_listener_container(event_target, eid, FALSE); + container = get_listener_container(event_target, event_info[eid].name, FALSE); if(!container) return; @@ -1299,7 +1301,7 @@ static BOOL is_cp_event(cp_static_data_t *data, DISPID dispid) static void call_event_handlers(EventTarget *event_target, DOMEvent *event) { const eventid_t eid = event->event_id; - const listener_container_t *container = get_listener_container(event_target, eid, FALSE); + const listener_container_t *container = get_listener_container(event_target, event_info[eid].name, FALSE); const BOOL cancelable = event_info[eid].flags & EVENT_CANCELABLE; const BOOL use_quirks = use_event_quirks(event_target); event_listener_t *listener, listeners_buf[8], *listeners = listeners_buf; @@ -1739,7 +1741,7 @@ static event_listener_t *get_onevent_listener(EventTarget *event_target, eventid listener_container_t *container; event_listener_t *listener; - container = get_listener_container(event_target, eid, alloc); + container = get_listener_container(event_target, event_info[eid].name, alloc); if(!container) return NULL; @@ -1887,7 +1889,7 @@ HRESULT attach_event(EventTarget *event_target, BSTR name, IDispatch *disp, VARI return S_OK; } - container = get_listener_container(event_target, eid, TRUE); + container = get_listener_container(event_target, event_info[eid].name, TRUE); if(!container) return E_OUTOFMEMORY; @@ -2107,18 +2109,10 @@ static HRESULT WINAPI EventTarget_addEventListener(IEventTarget *iface, BSTR typ listener_type_t listener_type = capture ? LISTENER_TYPE_CAPTURE : LISTENER_TYPE_BUBBLE; listener_container_t *container; event_listener_t *listener; - eventid_t eid; TRACE("(%p)->(%s %p %x)\n", This, debugstr_w(type), function, capture); - eid = str_to_eid(type); - if(eid == EVENTID_LAST) { - FIXME("Unsupported on event %s\n", debugstr_w(type)); - return E_NOTIMPL; - } - - - container = get_listener_container(This, eid, TRUE); + container = get_listener_container(This, type, TRUE); if(!container) return E_OUTOFMEMORY;

1 0