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

Francois Gouget : po: Update the English (neutral / Great Britain) translation.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: d279380671605c8675e255e2ad38b56c5fcf0a77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d279380671605c8675e255e2a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 14 00:59:59 2012 +0200 po: Update the English (neutral / Great Britain) translation. --- po/en.po | 2116 +++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 1197 insertions(+), 919 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d279380671605c8675e25…

1 0

Jacek Caban : jscript: Added get_op_uint helper.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: bad9afb3a0805931f1630b9e5001eeee3396a2ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=bad9afb3a0805931f1630b9e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 12 16:21:10 2012 +0200 jscript: Added get_op_uint helper. --- dlls/jscript/engine.c | 36 ++++++++++++++++++++---------------- 1 files changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index ccd07f7..40b1384 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -558,6 +558,10 @@ static inline BSTR get_op_bstr(exec_ctx_t *ctx, int i){ return i ? ctx->code->instrs[ctx->ip].arg2.bstr : ctx->code->instrs[ctx->ip].arg1.bstr; } +static inline unsigned get_op_uint(exec_ctx_t *ctx, int i){ + return i ? ctx->code->instrs[ctx->ip].arg2.uint : ctx->code->instrs[ctx->ip].arg1.uint; +} + /* ECMA-262 3rd Edition 12.2 */ static HRESULT interp_var_set(exec_ctx_t *ctx) { @@ -576,7 +580,7 @@ static HRESULT interp_var_set(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 12.6.4 */ static HRESULT interp_forin(exec_ctx_t *ctx) { - const HRESULT arg = ctx->code->instrs[ctx->ip].arg1.uint; + const HRESULT arg = get_op_uint(ctx, 0); IDispatch *var_obj, *obj = NULL; IDispatchEx *dispex; DISPID id, var_id; @@ -680,7 +684,7 @@ static HRESULT interp_pop_scope(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 12.13 */ static HRESULT interp_case(exec_ctx_t *ctx) { - const unsigned arg = ctx->code->instrs[ctx->ip].arg1.uint; + const unsigned arg = get_op_uint(ctx, 0); VARIANT *v; BOOL b; HRESULT hres; @@ -713,7 +717,7 @@ static HRESULT interp_throw(exec_ctx_t *ctx) static HRESULT interp_throw_ref(exec_ctx_t *ctx) { - const HRESULT arg = ctx->code->instrs[ctx->ip].arg1.uint; + const HRESULT arg = get_op_uint(ctx, 0); TRACE("%08x\n", arg); @@ -722,7 +726,7 @@ static HRESULT interp_throw_ref(exec_ctx_t *ctx) static HRESULT interp_throw_type(exec_ctx_t *ctx) { - const HRESULT hres = ctx->code->instrs[ctx->ip].arg1.uint; + const HRESULT hres = get_op_uint(ctx, 0); const WCHAR *str = ctx->code->instrs[ctx->ip].arg2.str; TRACE("%08x %s\n", hres, debugstr_w(str)); @@ -733,7 +737,7 @@ static HRESULT interp_throw_type(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 12.14 */ static HRESULT interp_push_except(exec_ctx_t *ctx) { - const unsigned arg1 = ctx->code->instrs[ctx->ip].arg1.uint; + const unsigned arg1 = get_op_uint(ctx, 0); const BSTR arg2 = get_op_bstr(ctx, 1); except_frame_t *except; unsigned stack_top; @@ -807,7 +811,7 @@ static HRESULT interp_end_finally(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 13 */ static HRESULT interp_func(exec_ctx_t *ctx) { - unsigned func_idx = ctx->code->instrs[ctx->ip].arg1.uint; + unsigned func_idx = get_op_uint(ctx, 0); jsdisp_t *dispex; VARIANT v; HRESULT hres; @@ -1010,7 +1014,7 @@ static HRESULT interp_new(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.2.3 */ static HRESULT interp_call(exec_ctx_t *ctx) { - const unsigned argn = ctx->code->instrs[ctx->ip].arg1.uint; + const unsigned argn = get_op_uint(ctx, 0); const int do_ret = ctx->code->instrs[ctx->ip].arg2.lng; VARIANT v, *objv; DISPPARAMS dp; @@ -1036,7 +1040,7 @@ static HRESULT interp_call(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.2.3 */ static HRESULT interp_call_member(exec_ctx_t *ctx) { - const unsigned argn = ctx->code->instrs[ctx->ip].arg1.uint; + const unsigned argn = get_op_uint(ctx, 0); const int do_ret = ctx->code->instrs[ctx->ip].arg2.lng; IDispatch *obj; DISPPARAMS dp; @@ -1102,7 +1106,7 @@ static HRESULT interp_ident(exec_ctx_t *ctx) static HRESULT interp_identid(exec_ctx_t *ctx) { const BSTR arg = get_op_bstr(ctx, 0); - const unsigned flags = ctx->code->instrs[ctx->ip].arg2.uint; + const unsigned flags = get_op_uint(ctx, 1); exprval_t exprval; HRESULT hres; @@ -1216,7 +1220,7 @@ static HRESULT interp_regexp(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.1.4 */ static HRESULT interp_carray(exec_ctx_t *ctx) { - const unsigned arg = ctx->code->instrs[ctx->ip].arg1.uint; + const unsigned arg = get_op_uint(ctx, 0); jsdisp_t *array; VARIANT *v, r; unsigned i; @@ -1283,7 +1287,7 @@ static HRESULT interp_obj_prop(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.11 */ static HRESULT interp_cnd_nz(exec_ctx_t *ctx) { - const unsigned arg = ctx->code->instrs[ctx->ip].arg1.uint; + const unsigned arg = get_op_uint(ctx, 0); VARIANT_BOOL b; HRESULT hres; @@ -1305,7 +1309,7 @@ static HRESULT interp_cnd_nz(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.11 */ static HRESULT interp_cnd_z(exec_ctx_t *ctx) { - const unsigned arg = ctx->code->instrs[ctx->ip].arg1.uint; + const unsigned arg = get_op_uint(ctx, 0); VARIANT_BOOL b; HRESULT hres; @@ -2387,7 +2391,7 @@ static HRESULT interp_assign(exec_ctx_t *ctx) /* JScript extension */ static HRESULT interp_assign_call(exec_ctx_t *ctx) { - const unsigned arg = ctx->code->instrs[ctx->ip].arg1.uint; + const unsigned arg = get_op_uint(ctx, 0); DISPID propput_dispid = DISPID_PROPERTYPUT; IDispatch *disp; DISPPARAMS dp; @@ -2425,9 +2429,9 @@ static HRESULT interp_undefined(exec_ctx_t *ctx) static HRESULT interp_jmp(exec_ctx_t *ctx) { - const unsigned arg = ctx->code->instrs[ctx->ip].arg1.uint; + const unsigned arg = get_op_uint(ctx, 0); - TRACE("\n"); + TRACE("%u\n", arg); ctx->ip = arg; return S_OK; @@ -2435,7 +2439,7 @@ static HRESULT interp_jmp(exec_ctx_t *ctx) static HRESULT interp_jmp_z(exec_ctx_t *ctx) { - const unsigned arg = ctx->code->instrs[ctx->ip].arg1.uint; + const unsigned arg = get_op_uint(ctx, 0); VARIANT_BOOL b; VARIANT *v; HRESULT hres;

1 0

Aric Stewart : quartz: Reinstate DSoundRender_Pause.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: fb42513a03f97c898386888f65fe872f108788c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb42513a03f97c898386888f6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 11 13:20:47 2012 -0500 quartz: Reinstate DSoundRender_Pause. --- dlls/quartz/dsoundrender.c | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 71634d3..696f0a2 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -750,6 +750,36 @@ static ULONG WINAPI DSoundRender_Release(IBaseFilter * iface) return refCount; } +static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) +{ + HRESULT hr = S_OK; + DSoundRenderImpl *This = (DSoundRenderImpl *)iface; + + TRACE("(%p/%p)->()\n", This, iface); + + EnterCriticalSection(&This->renderer.csRenderLock); + if (This->renderer.filter.state != State_Paused) + { + if (This->renderer.filter.state == State_Stopped) + { + if (This->renderer.pInputPin->pin.pConnectedTo) + ResetEvent(This->renderer.evComplete); + This->renderer.pInputPin->end_of_stream = 0; + } + + hr = IDirectSoundBuffer_Stop(This->dsbuffer); + if (SUCCEEDED(hr)) + This->renderer.filter.state = State_Paused; + + ResetEvent(This->blocked); + ResetEvent(This->renderer.RenderEvent); + } + ResetEvent(This->renderer.ThreadSignal); + LeaveCriticalSection(&This->renderer.csRenderLock); + + return hr; +} + static const IBaseFilterVtbl DSoundRender_Vtbl = { DSoundRender_QueryInterface, @@ -757,7 +787,7 @@ static const IBaseFilterVtbl DSoundRender_Vtbl = DSoundRender_Release, BaseFilterImpl_GetClassID, BaseRendererImpl_Stop, - BaseRendererImpl_Pause, + DSoundRender_Pause, BaseRendererImpl_Run, BaseRendererImpl_GetState, BaseRendererImpl_SetSyncSource,

1 0

Jacek Caban : include: Use widl to take care of nameless structs and unions .
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: 942f2ce79261a69b87cb61336f885bb29d167e57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=942f2ce79261a69b87cb61336… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 12 16:14:07 2012 +0200 include: Use widl to take care of nameless structs and unions. --- dlls/devenum/createdevenum.c | 34 ++++++++++++------------ dlls/dxdiagn/provider.c | 8 +++--- dlls/quartz/filtermapper.c | 60 +++++++++++++++++++++--------------------- dlls/quartz/regsvr.c | 4 +- dlls/strmbase/dllfunc.c | 4 +- include/amvideo.idl | 2 +- include/axextend.idl | 6 ++-- include/d3d10.idl | 6 ++-- include/devicetopology.idl | 6 ++-- include/imnxport.idl | 4 +- include/propidl.idl | 2 +- 11 files changed, 68 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=942f2ce79261a69b87cb6…

1 0

Jacek Caban : jscript: Make flags parameter of OP_regexp unsigned.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: e273636d4d362986878c399886c8013952c471fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e273636d4d362986878c39988… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 12 16:21:44 2012 +0200 jscript: Make flags parameter of OP_regexp unsigned. --- dlls/jscript/compile.c | 2 +- dlls/jscript/engine.c | 2 +- dlls/jscript/engine.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index f965948..bd11621 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -733,7 +733,7 @@ static HRESULT compile_literal(compiler_ctx_t *ctx, literal_t *literal) return E_OUTOFMEMORY; instr_ptr(ctx, instr)->arg1.str = str; - instr_ptr(ctx, instr)->arg2.lng = literal->u.regexp.flags; + instr_ptr(ctx, instr)->arg2.uint = literal->u.regexp.flags; return S_OK; } default: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 7d9b37a..bb42899 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1206,7 +1206,7 @@ static HRESULT interp_str(exec_ctx_t *ctx) static HRESULT interp_regexp(exec_ctx_t *ctx) { const WCHAR *source = ctx->code->instrs[ctx->ip].arg1.str; - const LONG flags = get_op_int(ctx, 1); + const unsigned flags = get_op_uint(ctx, 1); jsdisp_t *regexp; VARIANT v; HRESULT hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 8c70783..4a2c89e 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -90,7 +90,7 @@ typedef struct { X(preinc, 1, ARG_INT, 0) \ X(push_except,1, ARG_ADDR, ARG_BSTR) \ X(push_scope, 1, 0,0) \ - X(regexp, 1, ARG_STR, ARG_INT) \ + X(regexp, 1, ARG_STR, ARG_UINT) \ X(rshift, 1, 0,0) \ X(rshift2, 1, 0,0) \ X(str, 1, ARG_STR, 0) \

1 0

Jacek Caban : jscript: Added get_op_int helper.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: efe744a8ba54dcd62111b09158dfd64b5347e68d URL: http://source.winehq.org/git/wine.git/?a=commit;h=efe744a8ba54dcd62111b0915… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 12 16:21:20 2012 +0200 jscript: Added get_op_int helper. --- dlls/jscript/engine.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 40b1384..983787b 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -562,6 +562,10 @@ static inline unsigned get_op_uint(exec_ctx_t *ctx, int i){ return i ? ctx->code->instrs[ctx->ip].arg2.uint : ctx->code->instrs[ctx->ip].arg1.uint; } +static inline unsigned get_op_int(exec_ctx_t *ctx, int i){ + return i ? ctx->code->instrs[ctx->ip].arg2.lng : ctx->code->instrs[ctx->ip].arg1.lng; +} + /* ECMA-262 3rd Edition 12.2 */ static HRESULT interp_var_set(exec_ctx_t *ctx) { @@ -901,7 +905,7 @@ static HRESULT interp_member(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.2.1 */ static HRESULT interp_memberid(exec_ctx_t *ctx) { - const unsigned arg = ctx->code->instrs[ctx->ip].arg1.lng; + const unsigned arg = get_op_uint(ctx, 0); VARIANT *objv, *namev; IDispatch *obj; BSTR name; @@ -983,7 +987,7 @@ static void jsstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, DISPPARAMS *dp) /* ECMA-262 3rd Edition 11.2.2 */ static HRESULT interp_new(exec_ctx_t *ctx) { - const LONG arg = ctx->code->instrs[ctx->ip].arg1.lng; + const LONG arg = get_op_int(ctx, 0); VARIANT *constr, v; DISPPARAMS dp; HRESULT hres; @@ -1015,7 +1019,7 @@ static HRESULT interp_new(exec_ctx_t *ctx) static HRESULT interp_call(exec_ctx_t *ctx) { const unsigned argn = get_op_uint(ctx, 0); - const int do_ret = ctx->code->instrs[ctx->ip].arg2.lng; + const int do_ret = get_op_int(ctx, 1); VARIANT v, *objv; DISPPARAMS dp; HRESULT hres; @@ -1041,7 +1045,7 @@ static HRESULT interp_call(exec_ctx_t *ctx) static HRESULT interp_call_member(exec_ctx_t *ctx) { const unsigned argn = get_op_uint(ctx, 0); - const int do_ret = ctx->code->instrs[ctx->ip].arg2.lng; + const int do_ret = get_op_int(ctx, 1); IDispatch *obj; DISPPARAMS dp; VARIANT v; @@ -1149,7 +1153,7 @@ static HRESULT interp_null(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 7.8.2 */ static HRESULT interp_bool(exec_ctx_t *ctx) { - const LONG arg = ctx->code->instrs[ctx->ip].arg1.lng; + const int arg = get_op_int(ctx, 0); TRACE("%s\n", arg ? "true" : "false"); @@ -1159,7 +1163,7 @@ static HRESULT interp_bool(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 7.8.3 */ static HRESULT interp_int(exec_ctx_t *ctx) { - const LONG arg = ctx->code->instrs[ctx->ip].arg1.lng; + const int arg = get_op_int(ctx, 0); VARIANT v; TRACE("%d\n", arg); @@ -1202,7 +1206,7 @@ static HRESULT interp_str(exec_ctx_t *ctx) static HRESULT interp_regexp(exec_ctx_t *ctx) { const WCHAR *source = ctx->code->instrs[ctx->ip].arg1.str; - const LONG flags = ctx->code->instrs[ctx->ip].arg2.lng; + const LONG flags = get_op_int(ctx, 1); jsdisp_t *regexp; VARIANT v; HRESULT hres; @@ -1898,7 +1902,7 @@ static HRESULT interp_tonum(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.3.1 */ static HRESULT interp_postinc(exec_ctx_t *ctx) { - const int arg = ctx->code->instrs[ctx->ip].arg1.lng; + const int arg = get_op_int(ctx, 0); IDispatch *obj; DISPID id; VARIANT v; @@ -1933,7 +1937,7 @@ static HRESULT interp_postinc(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.4.4, 11.4.5 */ static HRESULT interp_preinc(exec_ctx_t *ctx) { - const int arg = ctx->code->instrs[ctx->ip].arg1.lng; + const int arg = get_op_int(ctx, 0); IDispatch *obj; DISPID id; VARIANT v;

1 0

Aric Stewart : strmbase: do not lock in BaseOutputPinImpl_GetDeliveryBuffer the MemInputPin will lock in the required places .
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: c736af74dc5d5d845822cb1527b28fa4f4ee511b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c736af74dc5d5d845822cb152… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 11 13:19:38 2012 -0500 strmbase: do not lock in BaseOutputPinImpl_GetDeliveryBuffer the MemInputPin will lock in the required places. --- dlls/strmbase/pin.c | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 50a90c4..936ae0c 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -580,27 +580,23 @@ HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(BaseOutputPin *This, IMediaSa TRACE("(%p, %p, %p, %x)\n", ppSample, tStart, tStop, dwFlags); - EnterCriticalSection(This->pin.pCritSec); + if (!This->pin.pConnectedTo) + hr = VFW_E_NOT_CONNECTED; + else { - if (!This->pin.pConnectedTo) - hr = VFW_E_NOT_CONNECTED; - else - { - IMemAllocator * pAlloc = NULL; + IMemAllocator * pAlloc = NULL; - hr = IMemInputPin_GetAllocator(This->pMemInputPin, &pAlloc); + hr = IMemInputPin_GetAllocator(This->pMemInputPin, &pAlloc); - if (SUCCEEDED(hr)) - hr = IMemAllocator_GetBuffer(pAlloc, ppSample, tStart, tStop, dwFlags); + if (SUCCEEDED(hr)) + hr = IMemAllocator_GetBuffer(pAlloc, ppSample, tStart, tStop, dwFlags); - if (SUCCEEDED(hr)) - hr = IMediaSample_SetTime(*ppSample, tStart, tStop); + if (SUCCEEDED(hr)) + hr = IMediaSample_SetTime(*ppSample, tStart, tStop); - if (pAlloc) - IMemAllocator_Release(pAlloc); - } + if (pAlloc) + IMemAllocator_Release(pAlloc); } - LeaveCriticalSection(This->pin.pCritSec); return hr; }

1 0

Jacek Caban : jscript: Store double op arg directly instead of by pointer.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: 35e663425dff635d3a0baf71ba9c6285cd25b78e URL: http://source.winehq.org/git/wine.git/?a=commit;h=35e663425dff635d3a0baf71b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 12 16:22:37 2012 +0200 jscript: Store double op arg directly instead of by pointer. --- dlls/jscript/compile.c | 80 ++++++++++++++++++++++++------------------------ dlls/jscript/engine.c | 10 +++--- dlls/jscript/engine.h | 7 ++-- 3 files changed, 49 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35e663425dff635d3a0ba…

1 0

Aric Stewart : quartz: Handle a crash and race condition that occurs on directsound renderer input pin disconnect .
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: a6dbc28bfed6666fc200ec66553a52fed5de379e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6dbc28bfed6666fc200ec665… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 11 13:21:07 2012 -0500 quartz: Handle a crash and race condition that occurs on directsound renderer input pin disconnect. --- dlls/quartz/dsoundrender.c | 54 +++++++++++++++++++++++++------------------ 1 files changed, 31 insertions(+), 23 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 696f0a2..0b5463e 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -527,7 +527,9 @@ static HRESULT WINAPI DSoundRender_BreakConnect(BaseRenderer* iface) if (This->threadid) { PostThreadMessageW(This->threadid, WM_APP, 0, 0); + LeaveCriticalSection(This->renderer.pInputPin->pin.pCritSec); WaitForSingleObject(This->advisethread, INFINITE); + EnterCriticalSection(This->renderer.pInputPin->pin.pCritSec); CloseHandle(This->advisethread); } if (This->dsbuffer) @@ -931,28 +933,26 @@ static DWORD WINAPI DSoundAdviseThread(LPVOID lpParam) { struct dsoundrender_timer *prev = &head, *cur; hr = IReferenceClock_GetTime(&This->IReferenceClock_iface, &curtime); - if (FAILED(hr)) { - FIXME("Could not get time: %08x\n", hr); - continue; - } - TRACE("Time: %s\n", wine_dbgstr_longlong(curtime)); - while (prev->next) { - cur = prev->next; - if (cur->start > curtime) { - TRACE("Skipping %p\n", cur); - prev = cur; - } else if (cur->periodicity) { - while (cur->start <= curtime) { - cur->start += cur->periodicity; - ReleaseSemaphore(cur->handle, 1, NULL); + if (SUCCEEDED(hr)) { + TRACE("Time: %s\n", wine_dbgstr_longlong(curtime)); + while (prev->next) { + cur = prev->next; + if (cur->start > curtime) { + TRACE("Skipping %p\n", cur); + prev = cur; + } else if (cur->periodicity) { + while (cur->start <= curtime) { + cur->start += cur->periodicity; + ReleaseSemaphore(cur->handle, 1, NULL); + } + prev = cur; + } else { + struct dsoundrender_timer *next = cur->next; + TRACE("Firing %p %s < %s\n", cur, wine_dbgstr_longlong(cur->start), wine_dbgstr_longlong(curtime)); + SetEvent(cur->handle); + HeapFree(GetProcessHeap(), 0, cur); + prev->next = next; } - prev = cur; - } else { - struct dsoundrender_timer *next = cur->next; - TRACE("Firing %p %s < %s\n", cur, wine_dbgstr_longlong(cur->start), wine_dbgstr_longlong(curtime)); - SetEvent(cur->handle); - HeapFree(GetProcessHeap(), 0, cur); - prev->next = next; } } if (!head.next) @@ -1039,9 +1039,17 @@ static HRESULT WINAPI ReferenceClock_GetTime(IReferenceClock *iface, DWORD writepos1, writepos2; EnterCriticalSection(&This->renderer.filter.csFilter); DSoundRender_UpdatePositions(This, &writepos1, &writepos2); - *pTime = This->play_time + time_from_pos(This, This->last_playpos); + if (This->renderer.pInputPin && This->renderer.pInputPin->pin.mtCurrent.pbFormat) + { + *pTime = This->play_time + time_from_pos(This, This->last_playpos); + hr = S_OK; + } + else + { + ERR("pInputPin Disconncted\n"); + hr = E_FAIL; + } LeaveCriticalSection(&This->renderer.filter.csFilter); - hr = S_OK; } if (FAILED(hr)) WARN("Could not get reference time (%x)!\n", hr);

1 0

Aric Stewart : quartz: Some cleanup around evComplete now that DSoundRenderer uses baseRenderer.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: 821b8a834c44793d1b62f1f113be8a21fce1021b URL: http://source.winehq.org/git/wine.git/?a=commit;h=821b8a834c44793d1b62f1f11… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 11 13:20:18 2012 -0500 quartz: Some cleanup around evComplete now that DSoundRenderer uses baseRenderer. --- dlls/quartz/dsoundrender.c | 35 +---------------------------------- 1 files changed, 1 insertions(+), 34 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 071d702..71634d3 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -243,9 +243,6 @@ end: static HRESULT DSoundRender_HandleEndOfStream(DSoundRenderImpl *This) { - HRESULT hr; - IMediaEventSink *pEventSink; - while (1) { DWORD pos1, pos2; @@ -260,23 +257,9 @@ static HRESULT DSoundRender_HandleEndOfStream(DSoundRenderImpl *This) EnterCriticalSection(&This->renderer.filter.csFilter); EnterCriticalSection(&This->renderer.csRenderLock); This->in_loop = 0; - if (This->renderer.pInputPin->flushing || - This->renderer.filter.state != State_Running) { - SetEvent(This->renderer.evComplete); - return S_FALSE; - } } - if (!This->renderer.filter.filterInfo.pGraph) - return S_OK; - - hr = IFilterGraph_QueryInterface(This->renderer.filter.filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); - if (SUCCEEDED(hr)) - { - hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, (LONG_PTR)This); - IMediaEventSink_Release(pEventSink); - } - return hr; + return S_OK; } static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, REFERENCE_TIME tStart, REFERENCE_TIME tStop, const BYTE *data, DWORD size) @@ -300,7 +283,6 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, REFERENCE_TIM This->in_loop = 0; if (This->renderer.pInputPin->flushing || This->renderer.filter.state == State_Stopped) { - SetEvent(This->renderer.evComplete); return This->renderer.filter.state == State_Paused ? S_OK : VFW_E_WRONG_STATE; } if (ret != WAIT_TIMEOUT) @@ -478,11 +460,6 @@ static VOID WINAPI DSoundRender_OnStartStreaming(BaseRenderer * iface) /* Unblock our thread, state changing from paused to running doesn't need a reset for state change */ SetEvent(This->blocked); } - else if (This->renderer.filter.state == State_Stopped) - { - ResetEvent(This->renderer.evComplete); - This->renderer.pInputPin->end_of_stream = 0; - } IDirectSoundBuffer_Play(This->dsbuffer, 0, 0, DSBPLAY_LOOPING); ResetEvent(This->blocked); } @@ -597,16 +574,6 @@ static HRESULT WINAPI DSoundRender_EndFlush(BaseRenderer* iface) TRACE("\n"); BaseRendererImpl_EndFlush(iface); - if (This->in_loop) { - ResetEvent(This->renderer.evComplete); - LeaveCriticalSection(This->renderer.pInputPin->pin.pCritSec); - LeaveCriticalSection(&This->renderer.filter.csFilter); - LeaveCriticalSection(&This->renderer.csRenderLock); - WaitForSingleObject(This->renderer.evComplete, -1); - EnterCriticalSection(This->renderer.pInputPin->pin.pCritSec); - EnterCriticalSection(&This->renderer.filter.csFilter); - EnterCriticalSection(&This->renderer.csRenderLock); - } if (This->renderer.filter.state != State_Stopped) ResetEvent(This->blocked);

1 0