May 2016 - Wine-Commits - list.winehq.org

Józef Kucia : d3d10core/tests: Use abbreviations for long D3D10 enum value names.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 856c913d05701dd09fc56f7317791ee46a4a7465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=856c913d05701dd09fc56f731… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 18 00:04:40 2016 +0200 d3d10core/tests: Use abbreviations for long D3D10 enum value names. 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/d3d10core/tests/device.c | 136 ++++++++++++++++++++++-------------------- 1 file changed, 71 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=856c913d05701dd09fc56…

1 0

Józef Kucia : d3d11/tests: Use abbreviations for long D3D11 enum value names.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 7c599a414745d4b1fde8e411360f8c23d5f19466 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c599a414745d4b1fde8e4113… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 18 00:04:39 2016 +0200 d3d11/tests: Use abbreviations for long D3D11 enum value names. 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/d3d11/tests/d3d11.c | 136 +++++++++++++++++++++++++---------------------- 1 file changed, 71 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c599a414745d4b1fde8e…

1 0

Nikolay Sivov : comctl32/header: Implement HDM_SETFILTERCHANGETIMEOUT.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: d1594aadda74b577a00e8d07fc3cc9512cd587f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1594aadda74b577a00e8d07f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 23:42:52 2016 +0300 comctl32/header: Implement HDM_SETFILTERCHANGETIMEOUT. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/header.c | 13 ++++++++++++- dlls/comctl32/tests/header.c | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index fb6a815..edfe385 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -84,6 +84,7 @@ typedef struct INT iHotItem; /* index of hot item (cursor is over this item) */ INT iHotDivider; /* index of the hot divider (used while dragging an item or by HDM_SETHOTDIVIDER) */ INT iMargin; /* width of the margin that surrounds a bitmap */ + INT filter_change_timeout; /* change timeout set with HDM_SETFILTERCHANGETIMEOUT */ HIMAGELIST himl; /* handle to an image list (may be 0) */ HEADER_ITEM *items; /* pointer to array of HEADER_ITEM's */ @@ -1540,6 +1541,7 @@ HEADER_Create (HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->iMargin = 3*GetSystemMetrics(SM_CXEDGE); infoPtr->nNotifyFormat = SendMessageW (infoPtr->hwndNotify, WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_QUERY); + infoPtr->filter_change_timeout = 1000; hdc = GetDC (0); hOldFont = SelectObject (hdc, GetStockObject (SYSTEM_FONT)); @@ -2054,6 +2056,14 @@ static LRESULT HEADER_ThemeChanged(const HEADER_INFO *infoPtr) return 0; } +static INT HEADER_SetFilterChangeTimeout(HEADER_INFO *infoPtr, INT timeout) +{ + INT old_timeout = infoPtr->filter_change_timeout; + + if (timeout != 0) + infoPtr->filter_change_timeout = timeout; + return old_timeout; +} static LRESULT WINAPI HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) @@ -2112,7 +2122,8 @@ HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) case HDM_SETBITMAPMARGIN: return HEADER_SetBitmapMargin(infoPtr, (INT)wParam); -/* case HDM_SETFILTERCHANGETIMEOUT: */ + case HDM_SETFILTERCHANGETIMEOUT: + return HEADER_SetFilterChangeTimeout(infoPtr, (INT)lParam); case HDM_SETHOTDIVIDER: return HEADER_SetHotDivider(infoPtr, wParam, lParam); diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 43fd175..3dc102d 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -994,8 +994,19 @@ static void test_hdm_filterMessages(HWND hParent) ok_sequence(sequences, PARENT_SEQ_INDEX, add_header_to_parent_seq, "adder header control to parent", FALSE); + timeout = SendMessageA(hChild, HDM_SETFILTERCHANGETIMEOUT, 0, 0); + ok(timeout == 1000, "got %d\n", timeout); + + timeout = SendMessageA(hChild, HDM_SETFILTERCHANGETIMEOUT, 0, 0); + ok(timeout == 1000, "got %d\n", timeout); + + timeout = SendMessageA(hChild, HDM_SETFILTERCHANGETIMEOUT, 0, -100); + ok(timeout == 1000, "got %d\n", timeout); + timeout = SendMessageA(hChild, HDM_SETFILTERCHANGETIMEOUT, 1, 100); - SendMessageA(hChild, HDM_SETFILTERCHANGETIMEOUT, 1, timeout); + ok(timeout == -100, "got %d\n", timeout); + retVal = SendMessageA(hChild, HDM_SETFILTERCHANGETIMEOUT, 1, timeout); + ok(retVal == 100, "got %d\n", retVal); flush_sequences(sequences, NUM_MSG_SEQUENCES);

1 0

Andrew Eikum : strmbase: Improve QualityControl tracing.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 0025649714f25af020862be8aa1ef82ca8d8f99b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0025649714f25af020862be8a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 17 13:43:36 2016 -0500 strmbase: Improve QualityControl tracing. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 10 ++++-- dlls/strmbase/qualitycontrol.c | 72 +++++++++++++++++++++++++++++++--------- dlls/winegstreamer/gstdemux.c | 5 ++- dlls/winegstreamer/gsttffilter.c | 5 ++- 4 files changed, 72 insertions(+), 20 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 44a032a..533db13 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1539,7 +1539,10 @@ static HRESULT WINAPI AviMuxOut_QualityControl_Notify(IQualityControl *iface, IBaseFilter *pSelf, Quality q) { AviMux *This = impl_from_out_IQualityControl(iface); - FIXME("(%p)->(%p Quality)\n", This, pSelf); + FIXME("(%p)->(%p { 0x%x %u %s %s })\n", This, pSelf, + q.Type, q.Proportion, + wine_dbgstr_longlong(q.Late), + wine_dbgstr_longlong(q.TimeStamp)); return E_NOTIMPL; } @@ -2273,7 +2276,10 @@ static HRESULT WINAPI AviMuxIn_QualityControl_Notify(IQualityControl *iface, { AviMuxIn *avimuxin = AviMuxIn_from_IQualityControl(iface); AviMux *This = impl_from_in_IPin(&avimuxin->pin.pin.IPin_iface); - FIXME("(%p:%s)->(%p Quality)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName), pSelf); + FIXME("(%p:%s)->(%p { 0x%x %u %s %s })\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName), pSelf, + q.Type, q.Proportion, + wine_dbgstr_longlong(q.Late), + wine_dbgstr_longlong(q.TimeStamp)); return E_NOTIMPL; } diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index 2e32b57..ce14c72 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -36,8 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase_qc); -HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControlImpl **ppv) { +#define XTIME_FMT "%u.%03u" +#define XTIME(u) (int)(u/10000000), (int)((u / 10000)%1000) + +HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControlImpl **ppv) +{ QualityControlImpl *This; + TRACE("%p, %p, %p\n", input, self, ppv); *ppv = HeapAlloc(GetProcessHeap(),0,sizeof(QualityControlImpl)); if (!*ppv) return E_OUTOFMEMORY; @@ -46,6 +51,7 @@ HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControl This->self = self; This->tonotify = NULL; This->clock = NULL; + TRACE("-> %p\n", This); return S_OK; } @@ -54,26 +60,36 @@ void QualityControlImpl_Destroy(QualityControlImpl *This) HeapFree(GetProcessHeap(),0,This); } -HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) { +HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) +{ QualityControlImpl *This = (QualityControlImpl*)iface; return IBaseFilter_QueryInterface(This->self, riid, ppv); } -ULONG WINAPI QualityControlImpl_AddRef(IQualityControl *iface) { +ULONG WINAPI QualityControlImpl_AddRef(IQualityControl *iface) +{ QualityControlImpl *This = (QualityControlImpl*)iface; return IBaseFilter_AddRef(This->self); } -ULONG WINAPI QualityControlImpl_Release(IQualityControl *iface) { +ULONG WINAPI QualityControlImpl_Release(IQualityControl *iface) +{ QualityControlImpl *This = (QualityControlImpl*)iface; return IBaseFilter_Release(This->self); } -HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { +HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) +{ HRESULT hr = S_FALSE; QualityControlImpl *This = (QualityControlImpl*)iface; + + TRACE("%p %p { 0x%x %u " XTIME_FMT " " XTIME_FMT " }\n", + This, sender, qm.Type, qm.Proportion, + XTIME(qm.Late), XTIME(qm.TimeStamp)); + if (This->tonotify) return IQualityControl_Notify(This->tonotify, This->self, qm); + if (This->input) { IPin *to = NULL; IPin_ConnectedTo(This->input, &to); @@ -87,11 +103,14 @@ HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *se IPin_Release(to); } } + return hr; } -HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityControl *tonotify) { +HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityControl *tonotify) +{ QualityControlImpl *This = (QualityControlImpl*)iface; + TRACE("%p %p\n", This, tonotify); This->tonotify = tonotify; return S_OK; } @@ -108,7 +127,9 @@ HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityContro #define UPDATE_RUNNING_AVG_P(avg,val) DO_RUNNING_AVG(avg,val,16) #define UPDATE_RUNNING_AVG_N(avg,val) DO_RUNNING_AVG(avg,val,4) -void QualityControlRender_Start(QualityControlImpl *This, REFERENCE_TIME tStart) { +void QualityControlRender_Start(QualityControlImpl *This, REFERENCE_TIME tStart) +{ + TRACE("%p " XTIME_FMT "\n", This, XTIME(tStart)); This->avg_render = This->last_in_time = This->last_left = This->avg_duration = This->avg_pt = -1; This->clockstart = tStart; This->avg_rate = -1.0; @@ -118,7 +139,9 @@ void QualityControlRender_Start(QualityControlImpl *This, REFERENCE_TIME tStart) } -void QualityControlRender_SetClock(QualityControlImpl *This, IReferenceClock *clock) { +void QualityControlRender_SetClock(QualityControlImpl *This, IReferenceClock *clock) +{ + TRACE("%p %p\n", This, clock); This->clock = clock; } @@ -127,6 +150,9 @@ static BOOL QualityControlRender_IsLate(QualityControlImpl *This, REFERENCE_TIME { REFERENCE_TIME max_lateness = 200000; + TRACE("%p " XTIME_FMT " " XTIME_FMT " " XTIME_FMT "\n", + This, XTIME(jitter), XTIME(start), XTIME(stop)); + /* we can add a valid stop time */ if (stop >= start) max_lateness += stop; @@ -148,8 +174,12 @@ static BOOL QualityControlRender_IsLate(QualityControlImpl *This, REFERENCE_TIME return FALSE; } -HRESULT QualityControlRender_WaitFor(QualityControlImpl *This, IMediaSample *sample, HANDLE ev) { +HRESULT QualityControlRender_WaitFor(QualityControlImpl *This, IMediaSample *sample, HANDLE ev) +{ REFERENCE_TIME start = -1, stop = -1, jitter = 0; + + TRACE("%p %p %p\n", This, sample, ev); + This->current_rstart = This->current_rstop = -1; This->current_jitter = 0; if (!This->clock || FAILED(IMediaSample_GetTime(sample, &start, &stop))) @@ -189,6 +219,8 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv) REFERENCE_TIME start, stop, jitter, pt, entered, left, duration; double rate; + TRACE("%p\n", priv); + if (!priv->clock || priv->current_rstart < 0) return; @@ -228,14 +260,12 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv) pt = priv->avg_pt; } -#define XTIME(u) (int)(u/10000000), (int)((u / 10000)%1000) - TRACE("start: %u.%03u, entered %u.%03u, left %u.%03u, pt: %u.%03u, " - "duration %u.%03u, jitter %u.%03u\n", XTIME(start), XTIME(entered), + TRACE("start: " XTIME_FMT ", entered " XTIME_FMT ", left " XTIME_FMT ", pt: " XTIME_FMT ", " + "duration " XTIME_FMT ", jitter " XTIME_FMT "\n", XTIME(start), XTIME(entered), XTIME(left), XTIME(pt), XTIME(duration), XTIME(jitter)); - TRACE("avg_duration: %u.%03u, avg_pt: %u.%03u, avg_rate: %g\n", + TRACE("avg_duration: " XTIME_FMT ", avg_pt: " XTIME_FMT ", avg_rate: %g\n", XTIME(priv->avg_duration), XTIME(priv->avg_pt), priv->avg_rate); -#undef XTIME /* collect running averages. for first observations, we copy the * values */ @@ -297,15 +327,25 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv) } -void QualityControlRender_BeginRender(QualityControlImpl *This) { +void QualityControlRender_BeginRender(QualityControlImpl *This) +{ + TRACE("%p\n", This); + This->start = -1; + if (!This->clock) return; + IReferenceClock_GetTime(This->clock, &This->start); + TRACE("at: " XTIME_FMT "\n", XTIME(This->start)); } -void QualityControlRender_EndRender(QualityControlImpl *This) { +void QualityControlRender_EndRender(QualityControlImpl *This) +{ REFERENCE_TIME elapsed; + + TRACE("%p\n", This); + if (!This->clock || This->start < 0 || FAILED(IReferenceClock_GetTime(This->clock, &This->stop))) return; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e7adbc5..f0b30e2 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1664,7 +1664,10 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil { GSTOutPin *pin = impl_from_IQualityControl(iface); REFERENCE_TIME late = qm.Late; - TRACE("(%p)->(%p, qm)\n", pin, sender); + TRACE("(%p)->(%p, { 0x%x %u %s %s })\n", pin, sender, + qm.Type, qm.Proportion, + wine_dbgstr_longlong(qm.Late), + wine_dbgstr_longlong(qm.TimeStamp)); mark_wine_thread(); if (qm.Late < 0 && -qm.Late > qm.TimeStamp) late = -qm.TimeStamp; diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 6c60fe3..cc544d0 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -478,7 +478,10 @@ static HRESULT WINAPI Gstreamer_transform_QOS(TransformFilter *iface, IBaseFilte GstTfImpl *This = (GstTfImpl*)iface; REFERENCE_TIME late = qm.Late; - TRACE("%p %p qm\n", This, sender); + TRACE("%p %p { 0x%x %u %s %s }\n", This, sender, + qm.Type, qm.Proportion, + wine_dbgstr_longlong(qm.Late), + wine_dbgstr_longlong(qm.TimeStamp)); mark_wine_thread();

1 0

Maarten Lankhorst : dsound: Remove state machine from render buffer.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 5b0914ece97b0732796313588f69ce1085664498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b0914ece97b0732796313588… Author: Maarten Lankhorst <wine(a)mblankhorst.nl> Date: Tue May 17 13:40:51 2016 -0500 dsound: Remove state machine from render buffer. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 2 +- dlls/dsound/dsound_private.h | 2 +- dlls/dsound/mixer.c | 36 +------------------------ dlls/dsound/primary.c | 64 ++++---------------------------------------- 4 files changed, 8 insertions(+), 96 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 195da0b..7519951 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -135,7 +135,7 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) device->ref = 1; device->priolevel = DSSCL_NORMAL; - device->state = STATE_STOPPED; + device->stopped = 1; device->speaker_config = DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); DSOUND_ParseSpeakerConfig(device); diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 3da0c19..0ca8aec 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -76,7 +76,7 @@ struct DirectSoundDevice DWORD priolevel, sleeptime; PWAVEFORMATEX pwfx, primary_pwfx; LPBYTE buffer; - DWORD writelead, buflen, aclen, fraglen, state, playpos, pad; + DWORD writelead, buflen, aclen, fraglen, playpos, pad, stopped; int nrofbuffers; IDirectSoundBufferImpl** buffers; RTL_RWLOCK buffer_list_lock; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 4ca0af1..727ceb8 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -694,10 +694,6 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) * also wipe out just-played sound data */ if (!pad) WARN("Probable buffer underrun\n"); - else if (device->state == STATE_STOPPED || - device->state == STATE_STARTING) { - TRACE("Buffer restarting\n"); - } hr = IAudioRenderClient_GetBuffer(device->render, maxq / block, (void*)&buffer); if(FAILED(hr)){ @@ -724,23 +720,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) ERR("ReleaseBuffer failed: %08x\n", hr); device->pad += maxq; - - if (maxq) { - if (device->state == STATE_STARTING || - device->state == STATE_STOPPED) { - if(DSOUND_PrimaryPlay(device) != DS_OK) - WARN("DSOUND_PrimaryPlay failed\n"); - else if (device->state == STATE_STARTING) - device->state = STATE_PLAYING; - else - device->state = STATE_STOPPING; - } - } else if (!pad && !maxq && (all_stopped == TRUE) && - (device->state == STATE_STOPPING)) { - device->state = STATE_STOPPED; - DSOUND_PrimaryStop(device); - } - } else if (device->state != STATE_STOPPED) { + } else if (!device->stopped) { if (maxq > device->buflen) maxq = device->buflen; if (writepos + maxq > device->buflen) { @@ -748,20 +728,6 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) DSOUND_WaveQueue(device, device->buffer, writepos + maxq - device->buflen); } else DSOUND_WaveQueue(device, device->buffer + writepos, maxq); - - /* in the DSSCL_WRITEPRIMARY mode, the app is totally in charge... */ - if (device->state == STATE_STARTING) { - if (DSOUND_PrimaryPlay(device) != DS_OK) - WARN("DSOUND_PrimaryPlay failed\n"); - else - device->state = STATE_PLAYING; - } - else if (device->state == STATE_STOPPING) { - if (DSOUND_PrimaryStop(device) != DS_OK) - WARN("DSOUND_PrimaryStop failed\n"); - else - device->state = STATE_STOPPED; - } } LeaveCriticalSection(&(device->mixlock)); diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 72c9475..0dc16f0 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -272,11 +272,6 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device, WAVEFORMATEX *wfx, HeapFree(GetProcessHeap(), 0, device->pwfx); device->pwfx = wfx; - if (device->state == STATE_PLAYING) - device->state = STATE_STARTING; - else if (device->state == STATE_STOPPING) - device->state = STATE_STOPPED; - device->writelead = (wfx->nSamplesPerSec / 100) * wfx->nBlockAlign; TRACE("buflen: %u, fraglen: %u\n", device->buflen, device->fraglen); @@ -384,7 +379,7 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) return S_OK; err_service: - ERR("GetService failed: %08x\n", hres); + WARN("GetService failed: %08x\n", hres); err: device->speaker_config = oldspeakerconfig; DSOUND_ParseSpeakerConfig(device); @@ -421,36 +416,6 @@ HRESULT DSOUND_PrimaryDestroy(DirectSoundDevice *device) return DS_OK; } -HRESULT DSOUND_PrimaryPlay(DirectSoundDevice *device) -{ - HRESULT hr; - - TRACE("(%p)\n", device); - - hr = IAudioClient_Start(device->client); - if(FAILED(hr) && hr != AUDCLNT_E_NOT_STOPPED){ - WARN("Start failed: %08x\n", hr); - return hr; - } - - return DS_OK; -} - -HRESULT DSOUND_PrimaryStop(DirectSoundDevice *device) -{ - HRESULT hr; - - TRACE("(%p)\n", device); - - hr = IAudioClient_Stop(device->client); - if(FAILED(hr)){ - WARN("Stop failed: %08x\n", hr); - return hr; - } - - return DS_OK; -} - WAVEFORMATEX *DSOUND_CopyFormat(const WAVEFORMATEX *wfex) { WAVEFORMATEX *pwfx; @@ -698,16 +663,7 @@ static HRESULT WINAPI PrimaryBufferImpl_Play(IDirectSoundBuffer *iface, DWORD re return DSERR_INVALIDPARAM; } - /* **** */ - EnterCriticalSection(&(device->mixlock)); - - if (device->state == STATE_STOPPED) - device->state = STATE_STARTING; - else if (device->state == STATE_STOPPING) - device->state = STATE_PLAYING; - - LeaveCriticalSection(&(device->mixlock)); - /* **** */ + device->stopped = 0; return DS_OK; } @@ -718,16 +674,7 @@ static HRESULT WINAPI PrimaryBufferImpl_Stop(IDirectSoundBuffer *iface) DirectSoundDevice *device = This->device; TRACE("(%p)\n", iface); - /* **** */ - EnterCriticalSection(&(device->mixlock)); - - if (device->state == STATE_PLAYING) - device->state = STATE_STOPPING; - else if (device->state == STATE_STARTING) - device->state = STATE_STOPPED; - - LeaveCriticalSection(&(device->mixlock)); - /* **** */ + device->stopped = 1; return DS_OK; } @@ -795,7 +742,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetCurrentPosition(IDirectSoundBuffer *i *playpos = mixpos; if (writepos) { *writepos = mixpos; - if (device->state != STATE_STOPPED) { + if (!device->stopped) { /* apply the documented 10ms lead to writepos */ *writepos += device->writelead; *writepos %= device->buflen; @@ -821,8 +768,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetStatus(IDirectSoundBuffer *iface, DWO } *status = 0; - if ((device->state == STATE_STARTING) || - (device->state == STATE_PLAYING)) + if (!device->stopped) *status |= DSBSTATUS_PLAYING | DSBSTATUS_LOOPING; TRACE("status=%x\n", *status);

1 0

Maarten Lankhorst : dsound: Prevent reopening device from leaving dsound object in invalid state.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 2fb97be1871a78ea6a2889ed975d33515d5468ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb97be1871a78ea6a2889ed9… Author: Maarten Lankhorst <wine(a)mblankhorst.nl> Date: Tue May 17 13:40:33 2016 -0500 dsound: Prevent reopening device from leaving dsound object in invalid state. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 49 +++---- dlls/dsound/dsound_private.h | 3 - dlls/dsound/primary.c | 331 ++++++++++++++++++++----------------------- 3 files changed, 174 insertions(+), 209 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2fb97be1871a78ea6a288…

1 0

Nikolay Sivov : dwrite/tests: Remove unused functions (Clang).
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 474033a4b8ea5eba7fecdc2739bd62857e6ae930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=474033a4b8ea5eba7fecdc273… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 21:22:32 2016 +0300 dwrite/tests: Remove unused functions (Clang). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 9 +-------- dlls/dwrite/tests/layout.c | 7 ------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index ea09bd5..90d7f6f 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -114,13 +114,6 @@ static inline void flush_sequence(struct call_sequence **seg, int sequence_index call_seq->count = call_seq->size = 0; } -static inline void flush_sequences(struct call_sequence **seq, int n) -{ - int i; - for (i = 0; i < n; i++) - flush_sequence(seq, i); -} - static void init_call_sequences(struct call_sequence **seq, int n) { int i; @@ -902,7 +895,7 @@ static void init_expected_sa(struct call_sequence **seq, const struct sa_test *t static const struct call_entry end_of_sequence = { LastKind }; int i; - flush_sequence(seq, 0); + flush_sequence(seq, ANALYZER_ID); /* add expected calls */ for (i = 0; i < test->item_count; i++) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 54056c7..9b9af6c 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -321,13 +321,6 @@ static inline void flush_sequence(struct drawcall_sequence **seg, int sequence_i call_seq->count = call_seq->size = 0; } -static inline void flush_sequences(struct drawcall_sequence **seq, int n) -{ - int i; - for (i = 0; i < n; i++) - flush_sequence(seq, i); -} - static void init_call_sequences(struct drawcall_sequence **seq, int n) { int i;

1 0

Frédéric Delanoy : ntdll: Fix a typo in an comment.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 07a87666a1b0e2e394df4e6cf78d1c2393b47143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07a87666a1b0e2e394df4e6cf… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed May 18 12:10:32 2016 +0200 ntdll: Fix a typo in an comment. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/threadpool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 781750b..15510e2 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1894,7 +1894,7 @@ static void tp_object_initialize( struct threadpool_object *object, struct threa /*********************************************************************** * tp_object_submit (internal) * - * Submits a threadpool object to the associcated threadpool. This + * Submits a threadpool object to the associated threadpool. This * function has to be VOID because TpPostWork can never fail on Windows. */ static void tp_object_submit( struct threadpool_object *object, BOOL signaled )

1 0

Józef Kucia : d3d10core/tests: Use D3D10 enum values instead of D3D11 ones.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: c653dbd1b4ee36091fdd7b70717bcde5713f2eca URL: http://source.winehq.org/git/wine.git/?a=commit;h=c653dbd1b4ee36091fdd7b707… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 18 00:04:41 2016 +0200 d3d10core/tests: Use D3D10 enum values instead of D3D11 ones. 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/d3d10core/tests/device.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 9500060..fd077b5 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -880,8 +880,8 @@ static void test_texture2d_interfaces(void) desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; desc.SampleDesc.Count = 1; desc.SampleDesc.Quality = 0; - desc.Usage = D3D11_USAGE_DEFAULT; - desc.BindFlags = D3D11_BIND_RENDER_TARGET; + desc.Usage = D3D10_USAGE_DEFAULT; + desc.BindFlags = D3D10_BIND_RENDER_TARGET; desc.CPUAccessFlags = 0; desc.MiscFlags = 0; @@ -997,15 +997,15 @@ static void test_create_texture3d(void) } tests[] = { - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_VERTEX_BUFFER, FALSE, TRUE}, - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_INDEX_BUFFER, FALSE, TRUE}, - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_CONSTANT_BUFFER, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_VERTEX_BUFFER, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_INDEX_BUFFER, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_CONSTANT_BUFFER, FALSE, TRUE}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R16G16B16A16_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R10G10B10A2_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_BIND_DEPTH_STENCIL, FALSE, FALSE}, - {DXGI_FORMAT_D24_UNORM_S8_UINT, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, - {DXGI_FORMAT_D32_FLOAT, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, D3D10_BIND_DEPTH_STENCIL, FALSE, FALSE}, + {DXGI_FORMAT_D24_UNORM_S8_UINT, D3D10_BIND_RENDER_TARGET, FALSE, FALSE}, + {DXGI_FORMAT_D32_FLOAT, D3D10_BIND_RENDER_TARGET, FALSE, FALSE}, }; if (!(device = create_device()))

1 0

Józef Kucia : wined3d: Implement SV_VertexID in GLSL backend.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 05f6f111bf7fb843eb5c7f275e30b9bcb48171f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05f6f111bf7fb843eb5c7f275… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 18 00:04:37 2016 +0200 wined3d: Implement SV_VertexID in GLSL backend. 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/wined3d/glsl_shader.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index df50f6a..4e58262 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1914,7 +1914,10 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont for (i = 0; i < shader->input_signature.element_count; ++i) { const struct wined3d_shader_signature_element *e = &shader->input_signature.elements[i]; - if (e->sysval_semantic == WINED3D_SV_INSTANCE_ID) + if (e->sysval_semantic == WINED3D_SV_VERTEX_ID) + shader_addline(buffer, "vec4 %s_in%u = vec4(intBitsToFloat(gl_VertexID), 0.0, 0.0, 0.0);\n", + prefix, e->register_idx); + else if (e->sysval_semantic == WINED3D_SV_INSTANCE_ID) shader_addline(buffer, "vec4 %s_in%u = vec4(intBitsToFloat(gl_InstanceID), 0.0, 0.0, 0.0);\n", prefix, e->register_idx); else

1 0