wine-commits July 2018

wine-commits@winehq.org

2 participants
405 discussions

Michael Stefaniuc : atl: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: wine Branch: master Commit: f55c5f3758ab346888e602d33f5b619ee87ff156 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f55c5f3758ab346888e602d3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 11 22:06:12 2018 +0200 atl: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/atl30.c | 2 +- dlls/atl/atl_ax.c | 2 +- dlls/atl/registrar.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/atl/atl30.c b/dlls/atl/atl30.c index d89cf06..61386b8 100644 --- a/dlls/atl/atl30.c +++ b/dlls/atl/atl30.c @@ -374,7 +374,7 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoW(_ATL_MODULEW *pm, _ATL_WNDCLASSINFOW if (!wci->m_wc.lpszClassName) { static const WCHAR szFormat[] = {'A','T','L','%','0','8','l','x',0}; - snprintfW(wci->m_szAutoName, sizeof(wci->m_szAutoName)/sizeof(WCHAR), szFormat, (UINT_PTR)wci); + snprintfW(wci->m_szAutoName, ARRAY_SIZE(wci->m_szAutoName), szFormat, (UINT_PTR)wci); TRACE("auto-generated class name %s\n", debugstr_w(wci->m_szAutoName)); wci->m_wc.lpszClassName = wci->m_szAutoName; } diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index aeda139..ff627cc 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1268,7 +1268,7 @@ static LPDLGTEMPLATEW AX_ConvertDialogTemplate(LPCDLGTEMPLATEW src_tmpl) if ( GET_WORD(tmp) == '{' ) /* all this mess created because of this line */ { static const WCHAR AtlAxWin[] = {'A','t','l','A','x','W','i','n', 0}; - PUT_BLOCK(AtlAxWin, sizeof(AtlAxWin)/sizeof(WCHAR)); + PUT_BLOCK(AtlAxWin, ARRAY_SIZE(AtlAxWin)); PUT_BLOCK(tmp, strlenW(tmp)+1); } else PUT_BLOCK(tmp, src-tmp); diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 96fcb0e..b717afe 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -394,11 +394,11 @@ static HRESULT do_process_root_key(LPCOLESTR data, BOOL do_register) hres = DISP_E_EXCEPTION; break; } - for(i=0; i<sizeof(root_keys)/sizeof(root_keys[0]); i++) { + for(i=0; i<ARRAY_SIZE(root_keys); i++) { if(!lstrcmpiW(buf.str, root_keys[i].name)) break; } - if(i == sizeof(root_keys)/sizeof(root_keys[0])) { + if(i == ARRAY_SIZE(root_keys)) { WARN("Wrong root key name: %s\n", debugstr_w(buf.str)); hres = DISP_E_EXCEPTION; break;

1 0

Jacek Caban : mshtml: Expose window.performance property to scripts.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: wine Branch: master Commit: 47df11ab6e5a20572226dd3d5562708a9c007c43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47df11ab6e5a20572226dd3d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 11 21:38:05 2018 +0200 mshtml: Expose window.performance property to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 3 +-- dlls/mshtml/tests/documentmode.js | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 401d19d..581de99 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3441,11 +3441,10 @@ static void HTMLWindow_bind_event(DispatchEx *dispex, eventid_t eid) static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compat_mode) { - /* FIXME: Expose getComputedStyle and performance once they are implemented. + /* FIXME: Expose getComputedStyle once it's implemented. * Stubs break existing web sites. */ static const dispex_hook_t window7_hooks[] = { {DISPID_IHTMLWINDOW7_GETCOMPUTEDSTYLE, NULL}, - {DISPID_IHTMLWINDOW7_PERFORMANCE, NULL}, {DISPID_UNKNOWN} }; if(compat_mode >= COMPAT_MODE_IE9) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index aa5954b..6ab301f 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -103,6 +103,8 @@ function test_window_props() { test_exposed("dispatchEvent", v >= 9); test_exposed("getSelection", v >= 9); test_exposed("onfocusout", v >= 9); + if(v >= 9) /* FIXME: native exposes it in all compat modes */ + test_exposed("performance", true); next_test(); }

1 0

Jacek Caban : mshtml: Add IHTMLPerformance:: timing property implementation.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: wine Branch: master Commit: 69d6ae3d8cfa9377b83846922805a26e26f18f87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69d6ae3d8cfa9377b8384692… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 11 21:37:59 2018 +0200 mshtml: Add IHTMLPerformance::timing property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/omnavigator.c | 388 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 387 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=69d6ae3d8cfa9377b838…

1 0

Jacek Caban : mshtml: Add IHTMLPerformance:: navigation property implementation.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: wine Branch: master Commit: dcfdcfea696bbafcb21c5d23f3758368b8e22366 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcfdcfea696bbafcb21c5d23… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 11 21:37:48 2018 +0200 mshtml: Add IHTMLPerformance::navigation property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/omnavigator.c | 176 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 175 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e28ecbc..6ef1397 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -200,6 +200,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLOptionElement) \ XIID(IHTMLOptionElementFactory) \ XIID(IHTMLPerformance) \ + XIID(IHTMLPerformanceNavigation) \ XIID(IHTMLPluginsCollection) \ XIID(IHTMLRect) \ XIID(IHTMLScreen) \ diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index faf15f0..a6a3e11 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -1323,8 +1323,160 @@ IOmNavigator *OmNavigator_Create(void) typedef struct { DispatchEx dispex; + IHTMLPerformanceNavigation IHTMLPerformanceNavigation_iface; + + LONG ref; +} HTMLPerformanceNavigation; + +static inline HTMLPerformanceNavigation *impl_from_IHTMLPerformanceNavigation(IHTMLPerformanceNavigation *iface) +{ + return CONTAINING_RECORD(iface, HTMLPerformanceNavigation, IHTMLPerformanceNavigation_iface); +} + +static HRESULT WINAPI HTMLPerformanceNavigation_QueryInterface(IHTMLPerformanceNavigation *iface, REFIID riid, void **ppv) +{ + HTMLPerformanceNavigation *This = impl_from_IHTMLPerformanceNavigation(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + *ppv = &This->IHTMLPerformanceNavigation_iface; + }else if(IsEqualGUID(&IID_IHTMLPerformanceNavigation, riid)) { + *ppv = &This->IHTMLPerformanceNavigation_iface; + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; + }else { + WARN("Unsupported interface %s\n", debugstr_mshtml_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI HTMLPerformanceNavigation_AddRef(IHTMLPerformanceNavigation *iface) +{ + HTMLPerformanceNavigation *This = impl_from_IHTMLPerformanceNavigation(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLPerformanceNavigation_Release(IHTMLPerformanceNavigation *iface) +{ + HTMLPerformanceNavigation *This = impl_from_IHTMLPerformanceNavigation(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + release_dispex(&This->dispex); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI HTMLPerformanceNavigation_GetTypeInfoCount(IHTMLPerformanceNavigation *iface, UINT *pctinfo) +{ + HTMLPerformanceNavigation *This = impl_from_IHTMLPerformanceNavigation(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLPerformanceNavigation_GetTypeInfo(IHTMLPerformanceNavigation *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLPerformanceNavigation *This = impl_from_IHTMLPerformanceNavigation(iface); + + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLPerformanceNavigation_GetIDsOfNames(IHTMLPerformanceNavigation *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLPerformanceNavigation *This = impl_from_IHTMLPerformanceNavigation(iface); + + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLPerformanceNavigation_Invoke(IHTMLPerformanceNavigation *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLPerformanceNavigation *This = impl_from_IHTMLPerformanceNavigation(iface); + + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLPerformanceNavigation_get_type(IHTMLPerformanceNavigation *iface, ULONG *p) +{ + HTMLPerformanceNavigation *This = impl_from_IHTMLPerformanceNavigation(iface); + + FIXME("(%p)->(%p) returning TYPE_NAVIGATE\n", This, p); + + *p = 0; /* TYPE_NAVIGATE */ + return S_OK; +} + +static HRESULT WINAPI HTMLPerformanceNavigation_get_redirectCount(IHTMLPerformanceNavigation *iface, ULONG *p) +{ + HTMLPerformanceNavigation *This = impl_from_IHTMLPerformanceNavigation(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLPerformanceNavigation_toString(IHTMLPerformanceNavigation *iface, BSTR *string) +{ + HTMLPerformanceNavigation *This = impl_from_IHTMLPerformanceNavigation(iface); + FIXME("(%p)->(%p)\n", This, string); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLPerformanceNavigation_toJSON(IHTMLPerformanceNavigation *iface, VARIANT *p) +{ + HTMLPerformanceNavigation *This = impl_from_IHTMLPerformanceNavigation(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLPerformanceNavigationVtbl HTMLPerformanceNavigationVtbl = { + HTMLPerformanceNavigation_QueryInterface, + HTMLPerformanceNavigation_AddRef, + HTMLPerformanceNavigation_Release, + HTMLPerformanceNavigation_GetTypeInfoCount, + HTMLPerformanceNavigation_GetTypeInfo, + HTMLPerformanceNavigation_GetIDsOfNames, + HTMLPerformanceNavigation_Invoke, + HTMLPerformanceNavigation_get_type, + HTMLPerformanceNavigation_get_redirectCount, + HTMLPerformanceNavigation_toString, + HTMLPerformanceNavigation_toJSON +}; + +static const tid_t HTMLPerformanceNavigation_iface_tids[] = { + IHTMLPerformanceNavigation_tid, + 0 +}; +static dispex_static_data_t HTMLPerformanceNavigation_dispex = { + NULL, + IHTMLPerformanceNavigation_tid, + HTMLPerformanceNavigation_iface_tids +}; + +typedef struct { + DispatchEx dispex; IHTMLPerformance IHTMLPerformance_iface; + LONG ref; + + IHTMLPerformanceNavigation *navigation; } HTMLPerformance; static inline HTMLPerformance *impl_from_IHTMLPerformance(IHTMLPerformance *iface) @@ -1372,6 +1524,8 @@ static ULONG WINAPI HTMLPerformance_Release(IHTMLPerformance *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + if(This->navigation) + IHTMLPerformanceNavigation_Release(This->navigation); release_dispex(&This->dispex); heap_free(This); } @@ -1418,8 +1572,26 @@ static HRESULT WINAPI HTMLPerformance_get_navigation(IHTMLPerformance *iface, IHTMLPerformanceNavigation **p) { HTMLPerformance *This = impl_from_IHTMLPerformance(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->navigation) { + HTMLPerformanceNavigation *navigation; + + navigation = heap_alloc_zero(sizeof(*navigation)); + if(!navigation) + return E_OUTOFMEMORY; + + navigation->IHTMLPerformanceNavigation_iface.lpVtbl = &HTMLPerformanceNavigationVtbl; + navigation->ref = 1; + init_dispex(&navigation->dispex, (IUnknown*)&navigation->IHTMLPerformanceNavigation_iface, + &HTMLPerformanceNavigation_dispex); + + This->navigation = &navigation->IHTMLPerformanceNavigation_iface; + } + + IHTMLPerformanceNavigation_AddRef(*p = This->navigation); + return S_OK; } static HRESULT WINAPI HTMLPerformance_get_timing(IHTMLPerformance *iface, IHTMLPerformanceTiming **p)

1 0

Akihiro Sagawa : winmm: Make TIME_TICKS position continuous.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: wine Branch: master Commit: ced8ce55b499e4b8e62549a3c353324a93f8f3db URL: https://source.winehq.org/git/wine.git/?a=commit;h=ced8ce55b499e4b8e62549a3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jul 11 22:33:23 2018 +0900 winmm: Make TIME_TICKS position continuous. 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 | 2 +- dlls/winmm/winmm.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index c550dfa..66f35ef 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -893,7 +893,7 @@ static void test_midiStream(UINT udev, HWND hwnd) expected = ret; ret = get_position(hm, TIME_TICKS); - todo_wine ok(ret > strmNopsWithDelta[0].dwDeltaTime && ret < strmNopsWithDelta[1].dwDeltaTime, + ok(ret > strmNopsWithDelta[0].dwDeltaTime && ret < strmNopsWithDelta[1].dwDeltaTime, "TIME_TICKS position is continuous, got %u\n", ret); /* shouldn't set time division property while playing */ diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 4b8d4de..f2dfae9 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -919,6 +919,7 @@ typedef struct WINE_MIDIStream { DWORD dwPulses; DWORD dwStartTicks; DWORD dwElapsedMS; + DWORD dwLastPositionMS; WORD wFlags; WORD status; HANDLE hEvent; @@ -1008,6 +1009,7 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI lpMidiStrm->dwPulses = 0; lpMidiStrm->dwElapsedMS = 0; lpMidiStrm->position_usec = 0; + lpMidiStrm->dwLastPositionMS = 0; LeaveCriticalSection(&lpMidiStrm->lock); /* this is not quite what MS doc says... */ midiOutReset(lpMidiStrm->hDevice); @@ -1181,7 +1183,6 @@ start_header: if (me->dwDeltaTime) { EnterCriticalSection(&lpMidiStrm->lock); lpMidiStrm->position_usec += MMSYSTEM_MidiStream_Convert(lpMidiStrm, me->dwDeltaTime); - lpMidiStrm->dwPulses += me->dwDeltaTime; LeaveCriticalSection(&lpMidiStrm->lock); dwToGo = lpMidiStrm->dwStartTicks + lpMidiStrm->position_usec / 1000; @@ -1205,6 +1206,10 @@ start_header: break; } } + EnterCriticalSection(&lpMidiStrm->lock); + lpMidiStrm->dwPulses += me->dwDeltaTime; + lpMidiStrm->dwLastPositionMS = midistream_get_playing_position(lpMidiStrm); + LeaveCriticalSection(&lpMidiStrm->lock); } switch (MEVT_EVENTTYPE(me->dwEvent & ~MEVT_F_CALLBACK)) { case MEVT_COMMENT: @@ -1332,6 +1337,7 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, lpMidiStrm->dwTempo = 500000; /* microseconds per quarter note, i.e. 120 BPM */ lpMidiStrm->dwTimeDiv = 24; /* ticks per quarter note */ lpMidiStrm->position_usec = 0; + lpMidiStrm->dwLastPositionMS = 0; lpMidiStrm->status = MSM_STATUS_PAUSED; lpMidiStrm->dwElapsedMS = 0; @@ -1467,6 +1473,24 @@ MMRESULT WINAPI midiStreamPause(HMIDISTRM hMidiStrm) return midistream_post_message_and_wait(lpMidiStrm, WINE_MSM_PAUSE, 0); } +static DWORD midistream_get_current_pulse(WINE_MIDIStream* lpMidiStrm) +{ + DWORD pulses = 0; + DWORD now = midistream_get_playing_position(lpMidiStrm); + DWORD delta = now - lpMidiStrm->dwLastPositionMS; + if (lpMidiStrm->dwTimeDiv > 0x8000) { + /* SMPTE, unchecked FIXME */ + BYTE nf = 256 - HIBYTE(lpMidiStrm->dwTimeDiv); + BYTE nsf = LOBYTE(lpMidiStrm->dwTimeDiv); + pulses = (delta * nf * nsf) / 1000; + } + else if (lpMidiStrm->dwTimeDiv) { + pulses = (DWORD)((double)(delta * lpMidiStrm->dwTimeDiv) * + 1000.0 / (double)lpMidiStrm->dwTempo); + } + return lpMidiStrm->dwPulses + pulses; +} + /************************************************************************** * midiStreamPosition [WINMM.@] */ @@ -1496,7 +1520,7 @@ MMRESULT WINAPI midiStreamPosition(HMIDISTRM hMidiStrm, LPMMTIME lpMMT, UINT cbm TRACE("=> %d ms\n", lpMMT->u.ms); break; case TIME_TICKS: - lpMMT->u.ticks = lpMidiStrm->dwPulses; + lpMMT->u.ticks = midistream_get_current_pulse(lpMidiStrm); TRACE("=> %d ticks\n", lpMMT->u.ticks); break; }

1 0

Akihiro Sagawa : winmm/tests: Add more MIDI stream position tests.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: wine Branch: master Commit: 2ae051720904a10ab3d14655ecde87012ead9aa6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ae051720904a10ab3d14655… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jul 11 22:33:21 2018 +0900 winmm/tests: Add more MIDI stream position tests. 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 | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index c46286b..c550dfa 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -509,6 +509,11 @@ static void test_position(HMIDISTRM hm, UINT typein, UINT typeout) case TIME_MIDI: trace("Stream position song pointer %u\n", mmtime.u.midi.songptrpos); break; + case TIME_SMPTE: + trace("Stream position %02u:%02u:%02u.%02u/%02u\n", + mmtime.u.smpte.hour, mmtime.u.smpte.min, mmtime.u.smpte.sec, + mmtime.u.smpte.frame, mmtime.u.smpte.fps); + break; } } @@ -573,6 +578,8 @@ static DWORD get_position(HMIDISTRM hm, UINT type) return mmtime.u.ms; case TIME_TICKS: return mmtime.u.ticks; + case TIME_MIDI: + return mmtime.u.midi.songptrpos; default: return MAXDWORD; } @@ -885,6 +892,10 @@ static void test_midiStream(UINT udev, HWND hwnd) ok(ret > expected && ret < expected + MARGIN, "expected greater than %ums, got %ums\n", expected, ret); expected = ret; + ret = get_position(hm, TIME_TICKS); + todo_wine ok(ret > strmNopsWithDelta[0].dwDeltaTime && ret < strmNopsWithDelta[1].dwDeltaTime, + "TIME_TICKS position is continuous, got %u\n", ret); + /* shouldn't set time division property while playing */ midiprop.tdiv.cbStruct = sizeof(midiprop.tdiv); midiprop.tdiv.dwTimeDiv = 24; @@ -914,6 +925,16 @@ static void test_midiStream(UINT udev, HWND hwnd) ok(ret >= strmNopsWithDelta[1].dwDeltaTime && ret < strmNopsWithDelta[1].dwDeltaTime + 3, "expected %u ticks, got %u\n", strmNopsWithDelta[1].dwDeltaTime, ret); + midiprop.tdiv.cbStruct = sizeof(midiprop.tdiv); + rc = midiStreamProperty(hm, (void*)&midiprop, MIDIPROP_GET | MIDIPROP_TIMEDIV); + ok(!rc, "midiStreamProperty(GET|TIMEDIV, dev=%d) rc=%s\n", udev, mmsys_error(rc)); + ok(midiprop.tdiv.dwTimeDiv == 24, "expected 24, got %u\n", midiprop.tdiv.dwTimeDiv); + + /* TIME_MIDI value is a quarter of TIME_TICKS, rounded */ + expected = (ret + midiprop.tdiv.dwTimeDiv/8) / (midiprop.tdiv.dwTimeDiv/4); + ret = get_position(hm, TIME_MIDI); + todo_wine ok(ret == expected, "expected song pointer %u, got %u\n", expected, ret); + ok(records.count == 2, "expected 2 MM_MOM_DONE messages, got %d\n", records.count); /* Time between midiStreamPause and midiStreamRestart isn't counted. @@ -932,6 +953,18 @@ static void test_midiStream(UINT udev, HWND hwnd) ret = get_position(hm, TIME_MS); ok(ret == 0, "expected 0ms, got %ums\n", ret); + midiprop.tdiv.cbStruct = sizeof(midiprop.tdiv); + midiprop.tdiv.dwTimeDiv = 0xe204; /* 30 fps, 4 ticks/frame */ + rc = midiStreamProperty(hm, (void*)&midiprop, MIDIPROP_SET | MIDIPROP_TIMEDIV); + ok(!rc, "midiStreamProperty(SET|TIMEDIV, dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + test_position(hm, TIME_MS, TIME_MS); + test_position(hm, TIME_TICKS, TIME_TICKS); + test_position(hm, TIME_MIDI, TIME_MS); + todo_wine test_position(hm, TIME_SMPTE, TIME_SMPTE); + test_position(hm, TIME_SAMPLES, TIME_MS); + test_position(hm, TIME_BYTES, TIME_MS); + rc = midiStreamClose(hm); ok(!rc, "midiStreamClose(dev=%d) rc=%s\n", udev, mmsys_error(rc)); CloseHandle(records.done);

1 0

Akihiro Sagawa : winmm: Use microsecond unit in MIDI stream position variable to simplify the code.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: wine Branch: master Commit: 16808d432c48973f26a2ab4fdacf7776127a028e URL: https://source.winehq.org/git/wine.git/?a=commit;h=16808d432c48973f26a2ab4f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jul 11 22:33:19 2018 +0900 winmm: Use microsecond unit in MIDI stream position variable to simplify the code. Since 32-bit variable overflows after approximately 70 minutes, we use 64-bit variable for this purpose. `remainder' member is removed. 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/winmm.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 0328721..4b8d4de 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -915,13 +915,12 @@ typedef struct WINE_MIDIStream { CRITICAL_SECTION lock; DWORD dwTempo; DWORD dwTimeDiv; - DWORD dwPositionMS; + ULONGLONG position_usec; DWORD dwPulses; DWORD dwStartTicks; DWORD dwElapsedMS; WORD wFlags; WORD status; - WORD remainder; HANDLE hEvent; LPMIDIHDR lpMidiHdr; } WINE_MIDIStream; @@ -1008,8 +1007,7 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI lpMidiStrm->status = MSM_STATUS_STOPPED; lpMidiStrm->dwPulses = 0; lpMidiStrm->dwElapsedMS = 0; - lpMidiStrm->dwPositionMS = 0; - lpMidiStrm->remainder = 0; + lpMidiStrm->position_usec = 0; LeaveCriticalSection(&lpMidiStrm->lock); /* this is not quite what MS doc says... */ midiOutReset(lpMidiStrm->hDevice); @@ -1181,15 +1179,12 @@ start_header: /* do we have to wait ? */ if (me->dwDeltaTime) { - DWORD delta; EnterCriticalSection(&lpMidiStrm->lock); - delta = lpMidiStrm->remainder + MMSYSTEM_MidiStream_Convert(lpMidiStrm, me->dwDeltaTime); - lpMidiStrm->dwPositionMS += delta / 1000; - lpMidiStrm->remainder = delta % 1000; + lpMidiStrm->position_usec += MMSYSTEM_MidiStream_Convert(lpMidiStrm, me->dwDeltaTime); lpMidiStrm->dwPulses += me->dwDeltaTime; LeaveCriticalSection(&lpMidiStrm->lock); - dwToGo = lpMidiStrm->dwStartTicks + lpMidiStrm->dwPositionMS; + dwToGo = lpMidiStrm->dwStartTicks + lpMidiStrm->position_usec / 1000; TRACE("%u/%u/%u\n", dwToGo, GetTickCount(), me->dwDeltaTime); while (dwToGo - (dwCurrTC = GetTickCount()) <= MAXLONG) { @@ -1204,7 +1199,7 @@ start_header: } } /* reset dwToGo because dwStartTicks might be updated */ - dwToGo = lpMidiStrm->dwStartTicks + lpMidiStrm->dwPositionMS; + dwToGo = lpMidiStrm->dwStartTicks + lpMidiStrm->position_usec / 1000; } else { /* timeout, so me->dwDeltaTime is elapsed, can break the while loop */ break; @@ -1334,10 +1329,9 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, if (!lpMidiStrm) return MMSYSERR_NOMEM; - lpMidiStrm->dwTempo = 500000; /* micro seconds per quarter note, i.e. 120 BPM */ + lpMidiStrm->dwTempo = 500000; /* microseconds per quarter note, i.e. 120 BPM */ lpMidiStrm->dwTimeDiv = 24; /* ticks per quarter note */ - lpMidiStrm->dwPositionMS = 0; - lpMidiStrm->remainder = 0; + lpMidiStrm->position_usec = 0; lpMidiStrm->status = MSM_STATUS_PAUSED; lpMidiStrm->dwElapsedMS = 0;

1 0

Piotr Caban : inetcpl.cpl: Add support for setting automatic proxy configuration.
by Alexandre Julliard 11 Jul '18

11 Jul '18

1 0

Henri Verbeet : include: Avoid redefining the DWRITE_GLYPH_RUN_DESCRIPTION typedef.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: wine Branch: master Commit: d771bd72965b64c407db2767f13471d224e7b946 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d771bd72965b64c407db2767… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 11 17:47:24 2018 +0430 include: Avoid redefining the DWRITE_GLYPH_RUN_DESCRIPTION typedef. Based on a patch by Alistair Leslie-Hughes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwrite.idl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/dwrite.idl b/include/dwrite.idl index e6ab2b7..bfb2c1b 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -404,14 +404,18 @@ struct DWRITE_GLYPH_RUN UINT32 bidiLevel; }; -typedef struct DWRITE_GLYPH_RUN_DESCRIPTION +cpp_quote("#ifndef __d2d1_1_h__") +typedef struct DWRITE_GLYPH_RUN_DESCRIPTION DWRITE_GLYPH_RUN_DESCRIPTION; +cpp_quote("#endif /* __d2d1_1_h__ */") + +struct DWRITE_GLYPH_RUN_DESCRIPTION { WCHAR const* localeName; WCHAR const* string; UINT32 stringLength; UINT16 const* clusterMap; UINT32 textPosition; -} DWRITE_GLYPH_RUN_DESCRIPTION; +}; typedef struct DWRITE_UNDERLINE {

1 0

Piotr Caban : msvcp120: Test values returned by _Concurrent_vector_base_v4 ::_Internal_clear.
by Alexandre Julliard 11 Jul '18

11 Jul '18

Module: wine Branch: master Commit: c9f174f0ca4e742223ff4e837a46ca6f3c5f00c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9f174f0ca4e742223ff4e83… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 11 12:32:33 2018 +0200 msvcp120: Test values returned by _Concurrent_vector_base_v4::_Internal_clear. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index cd8a514..a130827 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -2888,6 +2888,7 @@ static void test_vector_base_v4(void) size = (size_t)call_func2(p_vector_base_v4__Internal_clear, &v2, concurrent_vector_int_destroy); CHECK_CALLED(concurrent_vector_int_destroy); + ok(size == 3, "_Internal_clear returned %ld expected 3\n", (long)size); concurrent_vector_int_dtor(&v2); concurrent_vector_int_ctor(&v2); @@ -2921,6 +2922,7 @@ static void test_vector_base_v4(void) size = (size_t)call_func2(p_vector_base_v4__Internal_clear, &v2, concurrent_vector_int_destroy); CHECK_CALLED(concurrent_vector_int_destroy); + ok(size == 3, "_Internal_clear returned %ld expected 3\n", (long)size); concurrent_vector_int_dtor(&v2); concurrent_vector_int_ctor(&v2); @@ -2954,6 +2956,7 @@ static void test_vector_base_v4(void) size = (size_t)call_func2(p_vector_base_v4__Internal_clear, &v2, concurrent_vector_int_destroy); CHECK_CALLED(concurrent_vector_int_destroy); + ok(size == 2, "_Internal_clear returned %ld expected 2\n", (long)size); concurrent_vector_int_dtor(&v2); /* test for _Internal_compact */ @@ -3032,6 +3035,7 @@ static void test_vector_base_v4(void) size = (size_t)call_func2(p_vector_base_v4__Internal_clear, &v2, concurrent_vector_int_destroy); CHECK_CALLED(concurrent_vector_int_destroy); + ok(size == 4, "_Internal_clear returned %ld expected 4\n", (long)size); concurrent_vector_int_dtor(&v2); /* test for Internal_grow_by */

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
41
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2018