December 2011 - Wine-Commits

Jacek Caban : mshtml: Initialize VARIANT before passing it to variant_copy.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: 30467685bada5ebdad6d43c48d64643dfb85c0be URL: http://source.winehq.org/git/wine.git/?a=commit;h=30467685bada5ebdad6d43c48… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 12 14:49:33 2011 +0100 mshtml: Initialize VARIANT before passing it to variant_copy. --- dlls/mshtml/dispex.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 8a0ac44..dcbff1c 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -979,6 +979,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc case DISPATCH_PROPERTYGET: if(prop->flags & DYNPROP_DELETED) return DISP_E_UNKNOWNNAME; + V_VT(pvarRes) = VT_EMPTY; return variant_copy(pvarRes, &prop->var); case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: case DISPATCH_PROPERTYPUT:

1 0

Jacek Caban : jscript: Initialize VARIANT before passing it to disp_propget .
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: 64ef20ce5332f5601a6afe7f12f9a538e45d6475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64ef20ce5332f5601a6afe7f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 12 14:44:20 2011 +0100 jscript: Initialize VARIANT before passing it to disp_propget. --- dlls/jscript/engine.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 0bc5a5b..da02052 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1579,6 +1579,7 @@ static HRESULT interp_member(exec_ctx_t *ctx) hres = disp_get_id(ctx->parser->script, obj, arg, 0, &id); if(SUCCEEDED(hres)) { + V_VT(&v) = VT_EMPTY; hres = disp_propget(ctx->parser->script, obj, id, &v, &ctx->ei, NULL/*FIXME*/); }else if(hres == DISP_E_UNKNOWNNAME) { V_VT(&v) = VT_EMPTY;

1 0

Jacek Caban : jscript: Use bytecode for instanceof implementation.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: 6f35c8fd5d1b42b3726e7f572758f6dc55df93d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f35c8fd5d1b42b3726e7f572… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 12 14:43:54 2011 +0100 jscript: Use bytecode for instanceof implementation. --- dlls/jscript/compile.c | 2 + dlls/jscript/engine.c | 105 ++++++++++-------------------------------------- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 26 insertions(+), 85 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 1121838..0d4ce79 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -661,6 +661,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, return push_instr_bstr(ctx, OP_ident, ((identifier_expression_t*)expr)->identifier); case EXPR_IN: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_in); + case EXPR_INSTANCEOF: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_instanceof); case EXPR_LESS: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_lt); case EXPR_LESSEQ: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 7b85040..288c5d2 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1389,57 +1389,6 @@ static HRESULT return_bool(exprval_t *ret, DWORD b) return S_OK; } -static HRESULT get_binary_expr_values(script_ctx_t *ctx, binary_expression_t *expr, jsexcept_t *ei, VARIANT *lval, VARIANT *rval) -{ - exprval_t exprval; - HRESULT hres; - - hres = expr_eval(ctx, expr->expression1, 0, ei, &exprval); - if(FAILED(hres)) - return hres; - - hres = exprval_to_value(ctx, &exprval, ei, lval); - exprval_release(&exprval); - if(FAILED(hres)) - return hres; - - hres = expr_eval(ctx, expr->expression2, 0, ei, &exprval); - if(SUCCEEDED(hres)) { - hres = exprval_to_value(ctx, &exprval, ei, rval); - exprval_release(&exprval); - } - - if(FAILED(hres)) { - VariantClear(lval); - return hres; - } - - return S_OK; -} - -typedef HRESULT (*oper_t)(script_ctx_t*,VARIANT*,VARIANT*,jsexcept_t*,VARIANT*); - -static HRESULT binary_expr_eval(script_ctx_t *ctx, binary_expression_t *expr, oper_t oper, jsexcept_t *ei, - exprval_t *ret) -{ - VARIANT lval, rval, retv; - HRESULT hres; - - hres = get_binary_expr_values(ctx, expr, ei, &lval, &rval); - if(FAILED(hres)) - return hres; - - hres = oper(ctx, &lval, &rval, ei, &retv); - VariantClear(&lval); - VariantClear(&rval); - if(FAILED(hres)) - return hres; - - ret->type = EXPRVAL_VARIANT; - ret->u.var = retv; - return S_OK; -} - /* ECMA-262 3rd Edition 13 */ HRESULT function_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { @@ -2149,45 +2098,46 @@ static HRESULT interp_and(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.8.6 */ -static HRESULT instanceof_eval(script_ctx_t *ctx, VARIANT *inst, VARIANT *objv, jsexcept_t *ei, VARIANT *retv) +static HRESULT interp_instanceof(exec_ctx_t *ctx) { jsdisp_t *obj, *iter, *tmp = NULL; - VARIANT_BOOL ret = VARIANT_FALSE; - BOOL b; - VARIANT var; + VARIANT prot, *v; + BOOL ret = FALSE; HRESULT hres; static const WCHAR prototypeW[] = {'p','r','o','t','o','t', 'y', 'p','e',0}; - if(V_VT(objv) != VT_DISPATCH || !V_DISPATCH(objv)) - return throw_type_error(ctx, ei, JS_E_FUNCTION_EXPECTED, NULL); + v = stack_pop(ctx); + if(V_VT(v) != VT_DISPATCH || !V_DISPATCH(v)) { + VariantClear(v); + return throw_type_error(ctx->parser->script, &ctx->ei, JS_E_FUNCTION_EXPECTED, NULL); + } - obj = iface_to_jsdisp((IUnknown*)V_DISPATCH(objv)); + obj = iface_to_jsdisp((IUnknown*)V_DISPATCH(v)); + IDispatch_Release(V_DISPATCH(v)); if(!obj) { FIXME("non-jsdisp objects not supported\n"); return E_FAIL; } if(is_class(obj, JSCLASS_FUNCTION)) { - hres = jsdisp_propget_name(obj, prototypeW, &var, ei, NULL/*FIXME*/); + hres = jsdisp_propget_name(obj, prototypeW, &prot, &ctx->ei, NULL/*FIXME*/); }else { - hres = throw_type_error(ctx, ei, JS_E_FUNCTION_EXPECTED, NULL); + hres = throw_type_error(ctx->parser->script, &ctx->ei, JS_E_FUNCTION_EXPECTED, NULL); } jsdisp_release(obj); if(FAILED(hres)) return hres; - if(V_VT(&var) == VT_DISPATCH) { - if(V_VT(inst) == VT_DISPATCH) - tmp = iface_to_jsdisp((IUnknown*)V_DISPATCH(inst)); - for(iter = tmp; iter; iter = iter->prototype) { - hres = disp_cmp(V_DISPATCH(&var), to_disp(iter), &b); + v = stack_pop(ctx); + + if(V_VT(&prot) == VT_DISPATCH) { + if(V_VT(v) == VT_DISPATCH) + tmp = iface_to_jsdisp((IUnknown*)V_DISPATCH(v)); + for(iter = tmp; !ret && iter; iter = iter->prototype) { + hres = disp_cmp(V_DISPATCH(&prot), to_disp(iter), &ret); if(FAILED(hres)) break; - if(b) { - ret = VARIANT_TRUE; - break; - } } if(tmp) @@ -2197,23 +2147,12 @@ static HRESULT instanceof_eval(script_ctx_t *ctx, VARIANT *inst, VARIANT *objv, hres = E_FAIL; } - VariantClear(&var); + VariantClear(&prot); + VariantClear(v); if(FAILED(hres)) return hres; - V_VT(retv) = VT_BOOL; - V_BOOL(retv) = ret; - return S_OK; -} - -/* ECMA-262 3rd Edition 11.8.6 */ -HRESULT instanceof_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) -{ - binary_expression_t *expr = (binary_expression_t*)_expr; - - TRACE("\n"); - - return binary_expr_eval(ctx, expr, instanceof_eval, ei, ret); + return stack_push_bool(ctx, ret); } /* ECMA-262 3rd Edition 11.8.7 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index e6ad0c9..b9e6441 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -61,6 +61,7 @@ typedef struct _func_stack { X(ident, 1, ARG_BSTR, 0) \ X(identid, 1, ARG_BSTR, ARG_INT) \ X(in, 1, 0,0) \ + X(instanceof, 1, 0,0) \ X(int, 1, ARG_INT, 0) \ X(jmp, 0, ARG_ADDR, 0) \ X(jmp_nz, 0, ARG_ADDR, 0) \ @@ -565,7 +566,6 @@ HRESULT member_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exp HRESULT identifier_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT property_value_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT typeof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 76d1c1d..88676dd 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1310,7 +1310,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - instanceof_expression_eval, + compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, compiled_expression_eval,

1 0

Jacek Caban : jscript: Don't use EXPR_NEWREF in forin_statement_event.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: f8e3e92be3c979c52911bea326c28be9755cdfcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8e3e92be3c979c52911bea32… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 12 14:43:35 2011 +0100 jscript: Don't use EXPR_NEWREF in forin_statement_event. --- dlls/jscript/engine.c | 2 +- dlls/jscript/tests/lang.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 0f9263f..7b85040 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1012,7 +1012,7 @@ HRESULT forin_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_ return hres; } - hres = expr_eval(ctx, stat->in_expr, EXPR_NEWREF, &rt->ei, &exprval); + hres = expr_eval(ctx, stat->in_expr, 0, &rt->ei, &exprval); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index bbd2c42..5677d32 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -803,6 +803,11 @@ obj1 = new Object(); for(obj1.nonexistent; tmp; tmp = false) ok(!("nonexistent" in obj1), "nonexistent added to obj1"); +obj1 = new Object(); +for(tmp in obj1.nonexistent) + ok(false, "for(tmp in obj1.nonexistent) called with tmp = " + tmp); +ok(!("nonexistent" in obj1), "nonexistent added to obj1 by for..in loop"); + ok((void 1) === undefined, "(void 1) !== undefined"); var inobj = new Object();

1 0

Aric Stewart : usp10: Add New Tai Lue script.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: 05cd57b4f0fa799fa060739cf04be42959b0029f URL: http://source.winehq.org/git/wine.git/?a=commit;h=05cd57b4f0fa799fa060739cf… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Dec 12 07:32:10 2011 -0600 usp10: Add New Tai Lue script. --- dlls/usp10/shape.c | 2 ++ dlls/usp10/tests/usp10.c | 10 ++++++++++ dlls/usp10/usp10.c | 13 ++++++++++++- dlls/usp10/usp10_internal.h | 2 ++ 4 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index f2b2a7b..d2926ff 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -607,6 +607,8 @@ static const ScriptShapeData ShapingData[] = {{ myanmar_features, 2}, NULL, "mymr", "", NULL, NULL}, {{ myanmar_features, 2}, NULL, "mymr", "", NULL, NULL}, {{ standard_features, 2}, NULL, "tale", "", NULL, NULL}, + {{ standard_features, 2}, NULL, "talu", "", NULL, NULL}, + {{ standard_features, 2}, NULL, "talu", "", NULL, NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 7ae232a..45661b2 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -151,6 +151,7 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, #define mlym_tag MS_MAKE_TAG('m','l','y','m') #define mymr_tag MS_MAKE_TAG('m','y','m','r') #define tale_tag MS_MAKE_TAG('t','a','l','e') +#define talu_tag MS_MAKE_TAG('t','a','l','u') static void test_ScriptItemize( void ) { @@ -310,6 +311,11 @@ static void test_ScriptItemize( void ) static const itemTest t251[2] = {{{0,0,0,0,0},0,0,0,0,tale_tag,TRUE,{-1,-1,-1,-1,latn_tag}},{{0,0,0,0,0},10,0,0,0,-1,FALSE}}; static const itemTest t252[2] = {{{0,0,0,0,0},0,0,0,2,tale_tag,TRUE,{-1,1,1,1,latn_tag}},{{0,0,0,0,0},10,0,0,0,-1,FALSE}}; + /* New Tai Lue */ + static const WCHAR test26[] = {0x1992,0x19c4}; + static const itemTest t261[2] = {{{0,0,0,0,0},0,0,0,0,talu_tag,TRUE,{-1,-1,-1,-1,latn_tag}},{{0,0,0,0,0},2,0,0,0,-1,FALSE}}; + static const itemTest t262[2] = {{{0,0,0,0,0},0,0,0,2,talu_tag,TRUE,{-1,1,1,1,latn_tag}},{{0,0,0,0,0},2,0,0,0,-1,FALSE}}; + SCRIPT_ITEM items[15]; @@ -370,6 +376,7 @@ static void test_ScriptItemize( void ) test_items_ok(test23,6,NULL,NULL,2,t231,FALSE,0); test_items_ok(test24,12,NULL,NULL,1,t241,FALSE,0); test_items_ok(test25,10,NULL,NULL,1,t251,FALSE,0); + test_items_ok(test26,2,NULL,NULL,1,t261,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -402,6 +409,7 @@ static void test_ScriptItemize( void ) test_items_ok(test23,6,&Control,&State,2,t231,FALSE,0); test_items_ok(test24,12,&Control,&State,1,t241,FALSE,0); test_items_ok(test25,10,&Control,&State,1,t251,FALSE,0); + test_items_ok(test26,2,&Control,&State,1,t261,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -434,6 +442,7 @@ static void test_ScriptItemize( void ) test_items_ok(test23,6,&Control,&State,2,t232,FALSE,0); test_items_ok(test24,12,&Control,&State,1,t242,FALSE,0); test_items_ok(test25,10,&Control,&State,1,t252,FALSE,0); + test_items_ok(test26,2,&Control,&State,1,t262,FALSE,0); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -467,6 +476,7 @@ static void test_ScriptItemize( void ) test_items_ok(test23,6,&Control,&State,2,t232,FALSE,0); test_items_ok(test24,12,&Control,&State,1,t242,FALSE,0); test_items_ok(test25,10,&Control,&State,1,t252,FALSE,0); + test_items_ok(test26,2,&Control,&State,1,t262,FALSE,0); } static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 5782591..846d03c 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -113,6 +113,8 @@ static const scriptRange scriptRanges[] = { { Script_Georgian, 0x10a0, 0x10ff, 0, 0}, /* Tai Le: U+1950–U+197F */ { Script_Tai_Le, 0x1950, 0x197f, 0, 0}, + /* New Tai Lue: U+1980–U+19DF */ + { Script_New_Tai_Lue,0x1980, 0x19df, Script_New_Tai_Lue_Numeric, 0}, /* Vedic Extensions: U+1CD0-U+1CFF */ { Script_Devanagari, 0x1cd0, 0x1cff, Script_Devanagari_Numeric, 0}, /* Phonetic Extensions: U+1D00–U+1DBF */ @@ -395,6 +397,14 @@ static const scriptData scriptInformation[] = { {0, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('t','a','l','e'), {'M','i','c','r','o','s','o','f','t',' ','T','a','i',' ','L','e'}}, + {{Script_New_Tai_Lue, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {0, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('t','a','l','u'), + {'M','i','c','r','o','s','o','f','t',' ','N','e','w',' ','T','a','i',' ','L','u','e'}}, + {{Script_New_Tai_Lue_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {0, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('t','a','l','u'), + {'M','i','c','r','o','s','o','f','t',' ','N','e','w',' ','T','a','i',' ','L','u','e'}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -423,7 +433,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[42].props, &scriptInformation[43].props, &scriptInformation[44].props, &scriptInformation[45].props, &scriptInformation[46].props, &scriptInformation[47].props, - &scriptInformation[48].props, &scriptInformation[49].props + &scriptInformation[48].props, &scriptInformation[49].props, + &scriptInformation[50].props, &scriptInformation[51].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 2a385d5..5bb352a 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -79,6 +79,8 @@ #define Script_Myanmar 47 #define Script_Myanmar_Numeric 48 #define Script_Tai_Le 49 +#define Script_New_Tai_Lue 50 +#define Script_New_Tai_Lue_Numeric 51 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Jörg Höhle : winealsa: Implement IAudioClock:: GetPosition() using snd_pcm_delay.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: 62017964bead565a1da427faaf083e5103c27440 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62017964bead565a1da427faa… Author: Jörg Höhle <Joerg-Cyril.Hoehle(a)t-systems.com> Date: Fri Dec 9 17:12:54 2011 +0100 winealsa: Implement IAudioClock::GetPosition() using snd_pcm_delay. --- dlls/winealsa.drv/mmdevdrv.c | 50 ++++++++++++++++++++++++++++++++--------- 1 files changed, 39 insertions(+), 11 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index bfff159..359997e 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -109,7 +109,7 @@ struct ACImpl { BOOL initted, started; REFERENCE_TIME mmdev_period_rt; - UINT64 written_frames; + UINT64 written_frames, last_pos_frames; UINT32 bufsize_frames, held_frames, tmp_buffer_frames; UINT32 lcl_offs_frames; /* offs into local_buffer where valid data starts */ @@ -1790,6 +1790,7 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) if(snd_pcm_prepare(This->pcm_handle) < 0) WARN("snd_pcm_prepare failed\n"); + This->last_pos_frames = 0; This->held_frames = 0; This->written_frames = 0; This->lcl_offs_frames = 0; @@ -2291,8 +2292,12 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, UINT64 *qpctime) { ACImpl *This = impl_from_IAudioClock(iface); - UINT32 pad; - HRESULT hr; + UINT64 written_frames, position; + UINT32 held_frames; + int err; + snd_pcm_state_t alsa_state; + snd_pcm_uframes_t avail_frames; + snd_pcm_sframes_t delay_frames; TRACE("(%p)->(%p, %p)\n", This, pos, qpctime); @@ -2301,19 +2306,42 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, EnterCriticalSection(&This->lock); - hr = IAudioClient_GetCurrentPadding(&This->IAudioClient_iface, &pad); - if(FAILED(hr)){ - LeaveCriticalSection(&This->lock); - return hr; + /* call required to get accurate snd_pcm_state() */ + avail_frames = snd_pcm_avail_update(This->pcm_handle); + alsa_state = snd_pcm_state(This->pcm_handle); + written_frames = This->written_frames; + held_frames = This->held_frames; + + err = snd_pcm_delay(This->pcm_handle, &delay_frames); + if(err < 0){ + /* old Pulse, shortly after start */ + WARN("snd_pcm_delay failed in state %u: %d (%s)\n", alsa_state, err, snd_strerror(err)); } - if(This->dataflow == eRender) - *pos = This->written_frames - pad; - else if(This->dataflow == eCapture) - *pos = This->written_frames + pad; + if(This->dataflow == eRender){ + position = written_frames - held_frames; /* maximum */ + if(!This->started || alsa_state > SND_PCM_STATE_RUNNING) + ; /* mmdevapi stopped or ALSA underrun: pretend everything was played */ + else if(err<0 || delay_frames > position - This->last_pos_frames) + /* Pulse bug: past underrun, despite recovery, avail_frames & delay + * may be larger than alsa_bufsize_frames, as if cumulating frames. */ + /* Pulse bug: EIO(-5) shortly after starting: nothing played */ + position = This->last_pos_frames; + else if(delay_frames > 0) + position -= delay_frames; + }else + position = written_frames + held_frames; + + /* ensure monotic growth */ + This->last_pos_frames = position; LeaveCriticalSection(&This->lock); + TRACE("frames written: %u, held: %u, avail: %ld, delay: %ld state %d, pos: %u\n", + (UINT32)(written_frames%1000000000), held_frames, + avail_frames, delay_frames, alsa_state, (UINT32)(position%1000000000)); + *pos = position; + if(qpctime){ LARGE_INTEGER stamp, freq; QueryPerformanceCounter(&stamp);

1 0

Aric Stewart : usp10/tests: Check broken value for script tag as well.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: 1dc4c151d7b96e04aab4ac00c3d9767dbb05b4e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dc4c151d7b96e04aab4ac00c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Dec 12 07:31:45 2011 -0600 usp10/tests: Check broken value for script tag as well. --- dlls/usp10/tests/usp10.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 5f47903..74fe334 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -117,7 +117,9 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, winetest_ok(outpItems[x].a.eScript != SCRIPT_UNDEFINED, "%i: Undefined script\n",x); if (pScriptItemizeOpenType) { - if (items[x].todo_flag[4]) + if (items[x].isBroken && broken(tags[x] == items[x].broken_value[4])) + winetest_win_skip("This test broken on this platform\n"); + else if (items[x].todo_flag[4]) todo_wine winetest_ok(tags[x] == items[x].scriptTag,"%i:Incorrect Script Tag %x != %x\n",x,tags[x],items[x].scriptTag); else winetest_ok(tags[x] == items[x].scriptTag,"%i:Incorrect Script Tag %x != %x\n",x,tags[x],items[x].scriptTag);

1 0

Aric Stewart : usp10: Resync script_props table.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: 0d15c70a60e5ace9c5e2dca53eb9933e2d35f92b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d15c70a60e5ace9c5e2dca53… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Dec 12 07:31:35 2011 -0600 usp10: Resync script_props table. --- dlls/usp10/usp10.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a358f33..1f225b0 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -416,7 +416,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[40].props, &scriptInformation[41].props, &scriptInformation[42].props, &scriptInformation[43].props, &scriptInformation[44].props, &scriptInformation[45].props, - &scriptInformation[46].props, &scriptInformation[47].props + &scriptInformation[46].props, &scriptInformation[47].props, + &scriptInformation[48].props }; typedef struct {

1 0

Jacek Caban : jscript: Don't use EXPR_NEWREF in for_statement_event.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: 106fcb8e87c5c1f5ceea5d3c25785806a9d08b54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=106fcb8e87c5c1f5ceea5d3c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 12 14:43:24 2011 +0100 jscript: Don't use EXPR_NEWREF in for_statement_event. --- dlls/jscript/engine.c | 2 +- dlls/jscript/tests/lang.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 7886c0c..0f9263f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -929,7 +929,7 @@ HRESULT for_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t if(FAILED(hres)) return hres; }else if(stat->begin_expr) { - hres = expr_eval(ctx, stat->begin_expr, EXPR_NEWREF, &rt->ei, &exprval); + hres = expr_eval(ctx, stat->begin_expr, 0, &rt->ei, &exprval); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 3710ae7..bbd2c42 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -798,6 +798,11 @@ for(var fi=0; fi < 4; fi++) ok(fi < 4, "fi = " + fi); ok(fi === 4, "fi !== 4"); +tmp = true; +obj1 = new Object(); +for(obj1.nonexistent; tmp; tmp = false) + ok(!("nonexistent" in obj1), "nonexistent added to obj1"); + ok((void 1) === undefined, "(void 1) !== undefined"); var inobj = new Object();

1 0

Aric Stewart : usp10: Add Khmer script.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: f68c03c4b2b6ea60e20ea2045036d4bc355f2f23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f68c03c4b2b6ea60e20ea2045… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Dec 12 07:32:15 2011 -0600 usp10: Add Khmer script. --- dlls/usp10/shape.c | 66 +++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/tests/usp10.c | 9 ++++++ dlls/usp10/usp10.c | 15 +++++++++- dlls/usp10/usp10_internal.h | 2 + 4 files changed, 91 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f68c03c4b2b6ea60e20ea…

1 0