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

Józef Kucia : d3d12: Print message about Vulkan configuration problem to winediag channel.
by Alexandre Julliard 25 May '18

25 May '18

Module: wine Branch: master Commit: aa49a324fe86739b739e25dc8b3b451bbd27fe98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa49a324fe86739b739e25dc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 25 12:09:13 2018 +0200 d3d12: Print message about Vulkan configuration problem to winediag channel. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/d3d12_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index c1dc8c8..71eb1f9 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -35,6 +35,7 @@ #include <vkd3d.h> WINE_DEFAULT_DEBUG_CHANNEL(d3d12); +WINE_DECLARE_DEBUG_CHANNEL(winediag); HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) { @@ -117,7 +118,7 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe if (!(vk_funcs = get_vk_funcs())) { - ERR("Failed to get Wine Vulkan driver.\n"); + ERR_(winediag)("Failed to load Wine Vulkan driver.\n"); return E_FAIL; }

1 0

Józef Kucia : d3d12/tests: Add basic visual test.
by Alexandre Julliard 25 May '18

25 May '18

Module: wine Branch: master Commit: 3bd530494791caf03b37d03d5e936ceee2afd3ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bd530494791caf03b37d03d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 25 12:09:14 2018 +0200 d3d12/tests: Add basic visual test. Tests for Direct3D 12 are a part of libvkd3d. We still want to have a basic smoke test in order to check if Direct3D 12 is not completely broken in Wine. Moreover, we need tests for DXGI with Direct3D 12 devices. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/tests/d3d12.c | 551 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 551 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3bd530494791caf03b37…

1 0

Alexandre Julliard : Release 3.9.
by Alexandre Julliard 25 May '18

25 May '18

Module: wine Branch: master Commit: 59994c94092efb70fcbec0cb147401609d125e41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59994c94092efb70fcbec0cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 25 20:38:57 2018 +0200 Release 3.9. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 623 ++++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 351 insertions(+), 295 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=59994c94092efb70fcbe…

1 0

Jacek Caban : ole32/tests: Pass host_object_data struct as an argument to start_host_object2.
by Alexandre Julliard 25 May '18

25 May '18

Module: wine Branch: master Commit: 3834a6e3825827bfe4327ff114e4816050e3d752 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3834a6e3825827bfe4327ff1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 24 13:22:30 2018 +0200 ole32/tests: Pass host_object_data struct as an argument to start_host_object2. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 52 +++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index e8558dd..fbe1451 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -289,8 +289,8 @@ struct host_object_data IID iid; IUnknown *object; MSHLFLAGS marshal_flags; - HANDLE marshal_event; IMessageFilter *filter; + HANDLE marshal_event; }; static DWORD CALLBACK host_object_proc(LPVOID p) @@ -335,31 +335,27 @@ static DWORD CALLBACK host_object_proc(LPVOID p) return hr; } -static DWORD start_host_object2(IStream *stream, REFIID riid, IUnknown *object, MSHLFLAGS marshal_flags, IMessageFilter *filter, HANDLE *thread) +static DWORD start_host_object2(struct host_object_data *object_data, HANDLE *thread) { DWORD tid = 0; - HANDLE marshal_event = CreateEventA(NULL, FALSE, FALSE, NULL); - struct host_object_data *data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data)); - - data->stream = stream; - data->iid = *riid; - data->object = object; - data->marshal_flags = marshal_flags; - data->marshal_event = marshal_event; - data->filter = filter; + struct host_object_data *data; + data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data)); + *data = *object_data; + data->marshal_event = CreateEventA(NULL, FALSE, FALSE, NULL); *thread = CreateThread(NULL, 0, host_object_proc, data, 0, &tid); /* wait for marshaling to complete before returning */ - ok( !WaitForSingleObject(marshal_event, 10000), "wait timed out\n" ); - CloseHandle(marshal_event); + ok( !WaitForSingleObject(data->marshal_event, 10000), "wait timed out\n" ); + CloseHandle(data->marshal_event); return tid; } static DWORD start_host_object(IStream *stream, REFIID riid, IUnknown *object, MSHLFLAGS marshal_flags, HANDLE *thread) { - return start_host_object2(stream, riid, object, marshal_flags, NULL, thread); + struct host_object_data object_data = { stream, *riid, object, marshal_flags }; + return start_host_object2(&object_data, thread); } /* asks thread to release the marshal data because it has to be done by the @@ -1965,25 +1961,27 @@ static IMessageFilter MessageFilter = { &MessageFilter_Vtbl }; static void test_message_filter(void) { HRESULT hr; - IStream *pStream = NULL; IClassFactory *cf = NULL; DWORD tid; IUnknown *proxy = NULL; IMessageFilter *prev_filter = NULL; HANDLE thread; + struct host_object_data object_data = { NULL, IID_IClassFactory, (IUnknown*)&Test_ClassFactory, + MSHLFLAGS_NORMAL, &MessageFilter }; + cLocks = 0; - hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); + hr = CreateStreamOnHGlobal(NULL, TRUE, &object_data.stream); ok_ole_success(hr, CreateStreamOnHGlobal); - tid = start_host_object2(pStream, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &MessageFilter, &thread); + tid = start_host_object2(&object_data, &thread); ok_more_than_one_lock(); - IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); - hr = CoUnmarshalInterface(pStream, &IID_IClassFactory, (void **)&cf); + IStream_Seek(object_data.stream, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(object_data.stream, &IID_IClassFactory, (void **)&cf); ok_ole_success(hr, CoUnmarshalInterface); - IStream_Release(pStream); + IStream_Release(object_data.stream); ok_more_than_one_lock(); @@ -3855,13 +3853,15 @@ static IChannelHook TestChannelHook = { &TestChannelHookVtbl }; static void test_channel_hook(void) { - IStream *pStream = NULL; IClassFactory *cf = NULL; DWORD tid; IUnknown *proxy = NULL; HANDLE thread; HRESULT hr; + struct host_object_data object_data = { NULL, IID_IClassFactory, (IUnknown*)&Test_ClassFactory, + MSHLFLAGS_NORMAL, &MessageFilter }; + hr = CoRegisterChannelHook(&EXTENTID_WineTest, &TestChannelHook); ok_ole_success(hr, CoRegisterChannelHook); @@ -3870,17 +3870,17 @@ static void test_channel_hook(void) cLocks = 0; - hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); + hr = CreateStreamOnHGlobal(NULL, TRUE, &object_data.stream); ok_ole_success(hr, CreateStreamOnHGlobal); - tid = start_host_object2(pStream, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &MessageFilter, &thread); + tid = start_host_object2(&object_data, &thread); server_tid = tid; ok_more_than_one_lock(); - IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); - hr = CoUnmarshalInterface(pStream, &IID_IClassFactory, (void **)&cf); + IStream_Seek(object_data.stream, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(object_data.stream, &IID_IClassFactory, (void **)&cf); ok_ole_success(hr, CoUnmarshalInterface); - IStream_Release(pStream); + IStream_Release(object_data.stream); ok_more_than_one_lock();

1 0

Jacek Caban : ole32/tests: Add IRpcChannelBuffer and IRpcStubBuffer tests.
by Alexandre Julliard 25 May '18

25 May '18

Module: wine Branch: master Commit: 7f83dd11a468e95da22ead771098cfbd147094de URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f83dd11a468e95da22ead77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 24 13:23:09 2018 +0200 ole32/tests: Add IRpcChannelBuffer and IRpcStubBuffer tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 358 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 358 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7f83dd11a468e95da22e…

1 0

Jacek Caban : ole32: Introduce new ipid_to_ifstub helper and use it in ipid_get_dispatch_params.
by Alexandre Julliard 25 May '18

25 May '18

Module: wine Branch: master Commit: d1a480a2c9d0c135c77be8bfb194f02d1b7f4ccf URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1a480a2c9d0c135c77be8bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 24 13:23:21 2018 +0200 ole32: Introduce new ipid_to_ifstub helper and use it in ipid_get_dispatch_params. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stubmanager.c | 49 +++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 75c4b04..451a58a 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -470,7 +470,7 @@ ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tablewea /* gets the stub manager associated with an ipid - caller must have * a reference to the apartment while a reference to the stub manager is held. * it must also call release on the stub manager when it is no longer needed */ -static struct stub_manager *get_stub_manager_from_ipid(APARTMENT *apt, const IPID *ipid) +static struct stub_manager *get_stub_manager_from_ipid(APARTMENT *apt, const IPID *ipid, struct ifstub **ifstub) { struct stub_manager *result = NULL; struct list *cursor; @@ -480,7 +480,7 @@ static struct stub_manager *get_stub_manager_from_ipid(APARTMENT *apt, const IPI { struct stub_manager *m = LIST_ENTRY( cursor, struct stub_manager, entry ); - if (stub_manager_ipid_to_ifstub(m, ipid)) + if ((*ifstub = stub_manager_ipid_to_ifstub(m, ipid))) { result = m; stub_manager_int_addref(result); @@ -497,7 +497,8 @@ static struct stub_manager *get_stub_manager_from_ipid(APARTMENT *apt, const IPI return result; } -static HRESULT ipid_to_stub_manager(const IPID *ipid, APARTMENT **stub_apt, struct stub_manager **stubmgr_ret) +static HRESULT ipid_to_ifstub(const IPID *ipid, APARTMENT **stub_apt, + struct stub_manager **stubmgr_ret, struct ifstub **ifstub) { /* FIXME: hack for IRemUnknown */ if (ipid->Data2 == 0xffff) @@ -509,7 +510,7 @@ static HRESULT ipid_to_stub_manager(const IPID *ipid, APARTMENT **stub_apt, stru TRACE("Couldn't find apartment corresponding to TID 0x%04x\n", ipid->Data2); return RPC_E_INVALID_OBJECT; } - *stubmgr_ret = get_stub_manager_from_ipid(*stub_apt, ipid); + *stubmgr_ret = get_stub_manager_from_ipid(*stub_apt, ipid, ifstub); if (!*stubmgr_ret) { apartment_release(*stub_apt); @@ -519,6 +520,12 @@ static HRESULT ipid_to_stub_manager(const IPID *ipid, APARTMENT **stub_apt, stru return S_OK; } +static HRESULT ipid_to_stub_manager(const IPID *ipid, APARTMENT **stub_apt, struct stub_manager **stub) +{ + struct ifstub *ifstub; + return ipid_to_ifstub(ipid, stub_apt, stub, &ifstub); +} + /* gets the apartment, stub and channel of an object. the caller must * release the references to all objects (except iface) if the function * returned success, otherwise no references are returned. */ @@ -532,32 +539,22 @@ HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt, APARTMENT *apt; HRESULT hr; - hr = ipid_to_stub_manager(ipid, &apt, &stubmgr); + hr = ipid_to_ifstub(ipid, &apt, &stubmgr, &ifstub); if (hr != S_OK) return RPC_E_DISCONNECTED; - ifstub = stub_manager_ipid_to_ifstub(stubmgr, ipid); - if (ifstub) - { - *stub = ifstub->stubbuffer; - IRpcStubBuffer_AddRef(*stub); - *chan = ifstub->chan; - IRpcChannelBuffer_AddRef(*chan); - *stub_apt = apt; - *iid = ifstub->iid; - *iface = ifstub->iface; - - if (manager) - *manager = stubmgr; - else - stub_manager_int_release(stubmgr); - return S_OK; - } + *stub = ifstub->stubbuffer; + IRpcStubBuffer_AddRef(*stub); + *chan = ifstub->chan; + IRpcChannelBuffer_AddRef(*chan); + *stub_apt = apt; + *iid = ifstub->iid; + *iface = ifstub->iface; + + if (manager) + *manager = stubmgr; else - { stub_manager_int_release(stubmgr); - apartment_release(apt); - return RPC_E_DISCONNECTED; - } + return S_OK; } /* returns TRUE if it is possible to unmarshal, FALSE otherwise. */

1 0

Dmitry Timoshkov : gdiplus: Pass the correct GUID to encode_image_wic for GIF images.
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: cc119b9464591a23adced3b1bd1cb70872bf0883 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc119b9464591a23adced3b1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 24 04:06:26 2018 +0000 gdiplus: Pass the correct GUID to encode_image_wic for GIF images. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 9841857..5affe03 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4567,7 +4567,7 @@ static GpStatus encode_image_jpeg(GpImage *image, IStream* stream, static GpStatus encode_image_gif(GpImage *image, IStream* stream, GDIPCONST EncoderParameters* params) { - return encode_image_wic(image, stream, &CLSID_WICGifEncoder, params); + return encode_image_wic(image, stream, &GUID_ContainerFormatGif, params); } /*****************************************************************************

1 0

Alistair Leslie-Hughes : gdiplus: Display the GUID of the image type in GdipSaveImageToStream.
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: cf3362afb1894d3d5bae700d201cc7329a478234 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf3362afb1894d3d5bae700d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 24 04:06:28 2018 +0000 gdiplus: Display the GUID of the image type in GdipSaveImageToStream. Based on a patch by Dmitry Timoshkov. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 5affe03..e9b0b08 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4580,7 +4580,7 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, encode_image_func encode_image; int i; - TRACE("%p %p %p %p\n", image, stream, clsid, params); + TRACE("%p, %p, %s, %p\n", image, stream, wine_dbgstr_guid(clsid), params); if(!image || !stream) return InvalidParameter;

1 0

Nikolay Sivov : include: Update with latest DirectWrite API additions.
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: da705e5e53f2c3f87b47e786ce4a797c8d6f132e URL: https://source.winehq.org/git/wine.git/?a=commit;h=da705e5e53f2c3f87b47e786… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 24 16:58:50 2018 +0300 include: Update with latest DirectWrite API additions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwrite_3.idl | 376 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 360 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da705e5e53f2c3f87b47…

1 0

Akihiro Sagawa : winmm/tests: Add tests regarding MIDI stream player clocks and positions.
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: 70e541a693f538a952a287470b54070df6cef273 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70e541a693f538a952a28747… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon May 21 21:36:09 2018 +0900 winmm/tests: Add tests regarding MIDI stream player clocks and positions. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/midi.c | 144 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index b62b461..c78e465 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -19,6 +19,8 @@ */ #include <stdio.h> +#include <stdlib.h> +#include <string.h> #include <stddef.h> #include "windows.h" #include "mmsystem.h" @@ -531,6 +533,51 @@ static MIDISHORTEVENT strmNops[] = { /* Test callback + dwOffset */ { 0, 0, (MEVT_NOP <<24)| MEVT_F_CALLBACK }, }; +static MIDISHORTEVENT strmNopsWithDelta[] = { + { 0, 0, (MEVT_NOP <<24)| MEVT_F_CALLBACK }, + { 12, 0, (MEVT_NOP <<24)| MEVT_F_CALLBACK }, +}; + +struct time_stamp_records { + UINT count; + DWORD time_stamp[2]; + HANDLE done; +}; + +static void CALLBACK time_stamp_callback(HMIDIOUT hmo, UINT msg, DWORD_PTR instance, DWORD_PTR p1, DWORD_PTR p2) +{ + struct time_stamp_records *records = (struct time_stamp_records *)instance; + switch (msg) { + case MM_MOM_POSITIONCB: + if (records->count < sizeof(records->time_stamp)/sizeof(records->time_stamp[0])) + records->time_stamp[records->count] = GetTickCount(); + records->count++; + break; + case MM_MOM_DONE: + SetEvent(records->done); + break; + } +} + +static DWORD get_position(HMIDISTRM hm, UINT type) +{ + MMRESULT rc; + MMTIME mmtime; + mmtime.wType = type; + rc = midiStreamPosition(hm, &mmtime, sizeof(mmtime)); + if (rc != MMSYSERR_NOERROR || mmtime.wType != type) + return MAXDWORD; + + switch (mmtime.wType) { + case TIME_MS: + return mmtime.u.ms; + case TIME_TICKS: + return mmtime.u.ticks; + default: + return MAXDWORD; + } +} + static MMRESULT playStream(HMIDISTRM hm, LPMIDIHDR lpMidiHdr) { MMRESULT rc = midiStreamOut(hm, lpMidiHdr, sizeof(MIDIHDR)); @@ -549,6 +596,9 @@ static void test_midiStream(UINT udev, HWND hwnd) MIDIPROPTEMPO tempo; MIDIPROPTIMEDIV tdiv; } midiprop; + DWORD diff, expected, ret; + const DWORD MARGIN = 50; + struct time_stamp_records records; MIDIOUTCAPSA capsA; if (hwnd) @@ -786,6 +836,100 @@ static void test_midiStream(UINT udev, HWND hwnd) ok(!rc, "midiStreamClose rc=%s\n", mmsys_error(rc)); } + /* Test the player time clock and positions */ + memset(&records, 0, sizeof(records)); + records.done = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(records.done != NULL, "CreateEvent failed (dev=%d)\n", udev); + + rc = midiStreamOpen(&hm, &udev, 1, (DWORD_PTR)time_stamp_callback, (DWORD_PTR)&records, CALLBACK_FUNCTION); + ok(!rc, "midiStreamOpen(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + expected = 0; + ret = get_position(hm, TIME_MS); + ok(ret == expected, "expected %u, got %u\n", expected, ret); + + memset(&mhdr, 0, sizeof(mhdr)); + mhdr.lpData = (LPSTR)strmNopsWithDelta; + mhdr.dwBytesRecorded = mhdr.dwBufferLength = sizeof(strmNopsWithDelta); + rc = midiOutPrepareHeader((HMIDIOUT)hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutPrepareHeader(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + rc = midiStreamOut(hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiStreamOut(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + ret = get_position(hm, TIME_MS); + ok(ret == expected, "expected %u, got %u\n", expected, ret); + + rc = midiStreamRestart(hm); + ok(!rc, "midiStreamRestart(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + Sleep(50); + + rc = midiStreamPause(hm); + ok(!rc, "midiStreamPause(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + expected = 50; + ret = get_position(hm, TIME_MS); + todo_wine ok(ret >= expected && ret < expected + MARGIN, "expected %ums or greater, got %ums\n", expected, ret); + expected = ret; + + Sleep(100); + + ret = get_position(hm, TIME_MS); + ok(ret == expected, "expected %ums, got %ums\n", expected, ret); + + rc = midiStreamRestart(hm); + ok(!rc, "midiStreamRestart(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + Sleep(1); + ret = get_position(hm, TIME_MS); + todo_wine ok(ret > expected && ret < expected + MARGIN, "expected greater than %ums, got %ums\n", expected, ret); + expected = ret; + + ret = WaitForSingleObject(records.done, INFINITE); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed, got %d\n", ret); + + rc = midiStreamPause(hm); + ok(!rc, "midiStreamPause(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + expected = 250; /* = 12 ticks in 120 BPM */ + ret = get_position(hm, TIME_MS); + ok(ret >= expected - MARGIN && ret <= expected + MARGIN, + "expected greater than %ums, got %ums\n", expected, ret); + trace("after playing, got %ums\n", ret); + + /* set tempo to 240 BPM */ + midiprop.tempo.cbStruct = sizeof(midiprop.tempo); + midiprop.tempo.dwTempo = 250000; + rc = midiStreamProperty(hm, (void*)&midiprop, MIDIPROP_SET | MIDIPROP_TEMPO); + ok(!rc, "midiStreamProperty(SET|TEMPO, dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + /* a tempo change doesn't affect elapsed ticks */ + ret = get_position(hm, TIME_TICKS); + ok(ret >= strmNopsWithDelta[1].dwDeltaTime && ret < strmNopsWithDelta[1].dwDeltaTime + 3, + "expected %u ticks, got %u\n", strmNopsWithDelta[1].dwDeltaTime, ret); + + ok(records.count == 2, "expected 2 MM_MOM_DONE messages, got %d\n", records.count); + + /* Time between midiStreamPause and midiStreamRestart isn't counted. + So, the second event happens at dwDeltaTime(250ms) + 100ms after the first event. */ + expected = 250 + 100; + diff = records.time_stamp[1] - records.time_stamp[0]; + todo_wine ok(diff >= expected - MARGIN && diff <= expected + MARGIN, + "expected %u ~ %ums, got %ums (dev=%d)\n", expected - MARGIN, expected + MARGIN, diff, udev); + + rc = midiOutUnprepareHeader((HMIDIOUT)hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutUnprepareHeader(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + rc = midiStreamStop(hm); + ok(!rc, "midiStreamStop(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + ret = get_position(hm, TIME_MS); + todo_wine ok(ret == 0, "expected 0ms, got %ums\n", ret); + + rc = midiStreamClose(hm); + ok(!rc, "midiStreamClose(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + CloseHandle(records.done); + rc = midiOutGetDevCapsA((UINT_PTR)udev, &capsA, sizeof(capsA)); ok(!rc, "midiOutGetDevCaps(dev=%d) rc=%s\n", udev, mmsys_error(rc)); if (!strncmp(capsA.szPname, fluidsynth_prefix, strlen(fluidsynth_prefix)) ||

1 0