October 2008 - Wine-Commits

Dylan Smith : richedit: Prevent font or colour buffer overflow on stream out.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: fac8e957c53b5ffeed690c782cc0bd34e07c8438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fac8e957c53b5ffeed690c782… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Sep 30 17:11:29 2008 -0400 richedit: Prevent font or colour buffer overflow on stream out. Static sized buffers are used for storing the colours and fonts, so there needs to be a check to prevent these buffer from overflowing. --- dlls/riched20/writer.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 912cae3..6a6ad54 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -214,7 +214,7 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, if (table[i].bCharSet == bCharSet && (table[i].szFaceName == face || !lstrcmpW(table[i].szFaceName, face))) break; - if (i == pStream->nFontTblLen) { + if (i == pStream->nFontTblLen && i < STREAMOUT_FONTTBL_SIZE) { table[i].bCharSet = bCharSet; table[i].szFaceName = face; pStream->nFontTblLen++; @@ -226,7 +226,7 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, for (i = 1; i < pStream->nColorTblLen; i++) if (pStream->colortbl[i] == crColor) break; - if (i == pStream->nColorTblLen) { + if (i == pStream->nColorTblLen && i < STREAMOUT_COLORTBL_SIZE) { pStream->colortbl[i] = crColor; pStream->nColorTblLen++; } @@ -236,7 +236,7 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, for (i = 1; i < pStream->nColorTblLen; i++) if (pStream->colortbl[i] == crColor) break; - if (i == pStream->nColorTblLen) { + if (i == pStream->nColorTblLen && i < STREAMOUT_COLORTBL_SIZE) { pStream->colortbl[i] = crColor; pStream->nColorTblLen++; }

1 0

Dylan Smith : richedit: Make sure border properties are saved for undo/redo .
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: 3df78710a962c7f50e3f395c4e6e06f90ff88d98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3df78710a962c7f50e3f395c4… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Sep 30 17:11:19 2008 -0400 richedit: Make sure border properties are saved for undo/redo. Previously the paragraph and cell border properties were lost when deleting the text, then undoing the deletion. This would cause tables to lose the colour and width of the table border. --- dlls/riched20/para.c | 1 + dlls/riched20/undo.c | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 517bf28..565e323 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -287,6 +287,7 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, { ME_AddUndoItem(editor, diUndoSetParagraphFormat, tp); *tp->member.para.pFmt = *pNext->member.para.pFmt; + tp->member.para.border = pNext->member.para.border; } if (!editor->bEmulateVersion10) { /* v4.1 */ diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 8f3a22b..49802a3 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -96,6 +96,7 @@ ME_UndoItem *ME_AddUndoItem(ME_TextEditor *editor, ME_DIType type, const ME_Disp pItem->member.para.pFmt->cbSize = sizeof(PARAFORMAT2); pItem->member.para.pFmt->dwMask = 0; *pItem->member.para.pFmt = *pdi->member.para.pFmt; + pItem->member.para.border = pdi->member.para.border; pItem->member.para.nFlags = prev_para->member.para.nFlags & ~MEPF_CELL; pItem->member.para.pCell = NULL; break; @@ -293,6 +294,7 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, ME_DisplayItem *pItem) para = ME_FindItemBack(tmp.pRun, diParagraph); ME_AddUndoItem(editor, diUndoSetParagraphFormat, para); *para->member.para.pFmt = *pItem->member.para.pFmt; + para->member.para.border = pItem->member.para.border; break; } case diUndoSetCharFormat: @@ -343,12 +345,14 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, ME_DisplayItem *pItem) new_para->member.para.nFlags |= MEPF_ROWSTART; assert(pItem->member.para.pFmt->cbSize == sizeof(PARAFORMAT2)); *new_para->member.para.pFmt = *pItem->member.para.pFmt; + new_para->member.para.border = pItem->member.para.border; if (pItem->member.para.pCell) { ME_DisplayItem *pItemCell, *pCell; pItemCell = pItem->member.para.pCell; pCell = new_para->member.para.pCell; pCell->member.cell.nRightBoundary = pItemCell->member.cell.nRightBoundary; + pCell->member.cell.border = pItemCell->member.cell.border; } break; }

1 0

Jacek Caban : jscript: Added Date constructor object implementation.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: 84d8cddcae73b6a130fdae20636712ddb0f91c94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84d8cddcae73b6a130fdae206… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 17:48:18 2008 +0200 jscript: Added Date constructor object implementation. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/date.c | 494 ++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/global.c | 9 +- dlls/jscript/jscript.h | 3 + dlls/jscript/tests/lang.js | 2 + 5 files changed, 507 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84d8cddcae73b6a130fda…

1 0

Jacek Caban : jscript: Added delete expression for EXPRVAL_IDREF implementation.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: 9c248189f7ac0770adca62df351e3e80c3a2de27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c248189f7ac0770adca62df3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 17:48:45 2008 +0200 jscript: Added delete expression for EXPRVAL_IDREF implementation. --- dlls/jscript/engine.c | 11 +++++++++++ dlls/jscript/tests/lang.js | 7 +++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 87de0ce..212ad10 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2069,6 +2069,17 @@ HRESULT delete_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags return hres; switch(exprval.type) { + case EXPRVAL_IDREF: { + IDispatchEx *dispex; + + hres = IDispatch_QueryInterface(exprval.u.nameref.disp, &IID_IDispatchEx, (void**)&dispex); + if(SUCCEEDED(hres)) { + hres = IDispatchEx_DeleteMemberByDispID(dispex, exprval.u.idref.id); + b = VARIANT_TRUE; + IDispatchEx_Release(dispex); + } + break; + } case EXPRVAL_NAMEREF: { IDispatchEx *dispex; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 148dfed..f7ae2be 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -741,4 +741,11 @@ function varTestFunc(varTest3) { var varTest4; } +deleteTest = 1; +delete deleteTest; +try { + tmp = deleteTest; + ok(false, "deleteTest not throwed exception?"); +}catch(ex) {} + reportSuccess();

1 0

Jacek Caban : jscript: Added IDispatchEx:: GeleteMemberByDispID implementation.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: 65a207466dd3422e69e2dce302384414f23e67f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65a207466dd3422e69e2dce30… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 17:48:36 2008 +0200 jscript: Added IDispatchEx::GeleteMemberByDispID implementation. --- dlls/jscript/dispex.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 81fec89..76caf1c 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -571,6 +571,15 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return hres; } +static HRESULT delete_prop(dispex_prop_t *prop) +{ + heap_free(prop->name); + prop->name = NULL; + prop->type = PROP_DELETED; + + return S_OK; +} + static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) { DispatchEx *This = DISPATCHEX_THIS(iface); @@ -590,17 +599,23 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bst return S_OK; } - heap_free(prop->name); - prop->name = NULL; - prop->type = PROP_DELETED; - return S_OK; + return delete_prop(prop); } static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID id) { DispatchEx *This = DISPATCHEX_THIS(iface); - FIXME("(%p)->(%x)\n", This, id); - return E_NOTIMPL; + dispex_prop_t *prop; + + TRACE("(%p)->(%x)\n", This, id); + + prop = get_prop(This, id); + if(!prop) { + WARN("invalid id\n"); + return DISP_E_MEMBERNOTFOUND; + } + + return delete_prop(prop); } static HRESULT WINAPI DispatchEx_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex)

1 0

Jacek Caban : jscript: Don't clear uninitialized variable.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: a9c4d2b18e49957635fe0f942a1357cdf4cd59f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c4d2b18e49957635fe0f942… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 17:47:55 2008 +0200 jscript: Don't clear uninitialized variable. --- dlls/jscript/engine.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 2c96bc4..87de0ce 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2862,10 +2862,8 @@ HRESULT assign_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags hres = put_value(ctx->parser->script, &exprval, &rval, ei); exprval_release(&exprval); - if(FAILED(hres)) { - VariantClear(&rval); + if(FAILED(hres)) return hres; - } ret->type = EXPRVAL_VARIANT; ret->u.var = rval;

1 0

Jacek Caban : jscript: Allocate variables when entering execution context.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: 50a84b454541eba099b082d9fa912df538b1c4ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a84b454541eba099b082d9f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 17:47:40 2008 +0200 jscript: Allocate variables when entering execution context. --- dlls/jscript/engine.c | 11 +++++++++- dlls/jscript/engine.h | 15 +++++++++++++ dlls/jscript/parser.y | 49 +++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/lang.js | 18 ++++++++++++++++ 4 files changed, 89 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 5d231f2..2c96bc4 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -351,6 +351,7 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so script_ctx_t *script = parser->script; function_declaration_t *func; parser_ctx_t *prev_parser; + var_list_t *var; VARIANT val, tmp; statement_t *stat; exec_ctx_t *prev_ctx; @@ -369,7 +370,15 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so V_VT(&var) = VT_DISPATCH; V_DISPATCH(&var) = (IDispatch*)_IDispatchEx_(func_obj); hres = jsdisp_propput_name(ctx->var_disp, func->identifier, script->lcid, &var, ei, NULL); - IDispatchEx_Release(_IDispatchEx_(func_obj)); + jsdisp_release(func_obj); + if(FAILED(hres)) + return hres; + } + + for(var = source->variables; var; var = var->next) { + DISPID id = 0; + + hres = jsdisp_get_id(ctx->var_disp, var->identifier, fdexNameEnsure, &id); if(FAILED(hres)) return hres; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index beabc9b..3746b5b 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -23,6 +23,19 @@ typedef struct _obj_literal_t { struct _obj_literal_t *next; } obj_literal_t; +typedef struct _var_list_t { + const WCHAR *identifier; + + struct _var_list_t *next; +} var_list_t; + +typedef struct _func_stack { + var_list_t *var_head; + var_list_t *var_tail; + + struct _func_stack *next; +} func_stack_t; + typedef struct _parser_ctx_t { LONG ref; @@ -38,6 +51,7 @@ typedef struct _parser_ctx_t { jsheap_t heap; obj_literal_t *obj_literals; + func_stack_t *func_stack; struct _parser_ctx_t *next; } parser_ctx_t; @@ -289,6 +303,7 @@ struct _source_elements_t { statement_t *statement_tail; function_declaration_t *functions; function_declaration_t *functions_tail; + var_list_t *variables; }; typedef struct { diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 96ca9e5..98ee250 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -31,6 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); static int parser_error(const char*); static BOOL allow_auto_semicolon(parser_ctx_t*); static void program_parsed(parser_ctx_t*,source_elements_t*); +static source_elements_t *function_body_parsed(parser_ctx_t*,source_elements_t*); typedef struct _statement_list_t { statement_t *head; @@ -120,6 +121,12 @@ typedef struct _parameter_list_t { static parameter_list_t *new_parameter_list(parser_ctx_t*,const WCHAR*); static parameter_list_t *parameter_list_add(parser_ctx_t*,parameter_list_t*,const WCHAR*); +static void push_func(parser_ctx_t*); +static inline void pop_func(parser_ctx_t *ctx) +{ + ctx->func_stack = ctx->func_stack->next; +} + static expression_t *new_function_expression(parser_ctx_t*,const WCHAR*,parameter_list_t*, source_elements_t*,const WCHAR*,DWORD); static expression_t *new_binary_expression(parser_ctx_t*,expression_type_t,expression_t*,expression_t*); @@ -244,6 +251,7 @@ static source_elements_t *source_elements_add_function(source_elements_t*,functi %type <property_list> PropertyNameAndValueList %type <literal> PropertyName %type <literal> BooleanLiteral +%type <srcptr> KFunction %% @@ -261,17 +269,20 @@ SourceElements /* ECMA-262 3rd Edition 13 */ FunctionDeclaration - : kFUNCTION tIdentifier '(' FormalParameterList_opt ')' '{' FunctionBody '}' + : KFunction tIdentifier '(' FormalParameterList_opt ')' '{' FunctionBody '}' { $$ = new_function_declaration(ctx, $2, $4, $7, $1, $8-$1+1); } /* ECMA-262 3rd Edition 13 */ FunctionExpression - : kFUNCTION Identifier_opt '(' FormalParameterList_opt ')' '{' FunctionBody '}' + : KFunction Identifier_opt '(' FormalParameterList_opt ')' '{' FunctionBody '}' { $$ = new_function_expression(ctx, $2, $4, $7, $1, $8-$1+1); } +KFunction + : kFUNCTION { push_func(ctx); $$ = $1; } + /* ECMA-262 3rd Edition 13 */ FunctionBody - : SourceElements { $$ = $1; } + : SourceElements { $$ = function_body_parsed(ctx, $1); } /* ECMA-262 3rd Edition 13 */ FormalParameterList @@ -1018,11 +1029,20 @@ static statement_t *new_block_statement(parser_ctx_t *ctx, statement_list_t *lis static variable_declaration_t *new_variable_declaration(parser_ctx_t *ctx, const WCHAR *identifier, expression_t *expr) { variable_declaration_t *ret = parser_alloc(ctx, sizeof(variable_declaration_t)); + var_list_t *var_list = parser_alloc(ctx, sizeof(var_list_t)); ret->identifier = identifier; ret->expr = expr; ret->next = NULL; + var_list->identifier = identifier; + var_list->next = NULL; + + if(ctx->func_stack->var_tail) + ctx->func_stack->var_tail = ctx->func_stack->var_tail->next = var_list; + else + ctx->func_stack->var_head = ctx->func_stack->var_tail = var_list; + return ret; } @@ -1511,8 +1531,29 @@ statement_list_t *statement_list_add(statement_list_t *list, statement_t *statem return list; } +static void push_func(parser_ctx_t *ctx) +{ + func_stack_t *new_func = parser_alloc_tmp(ctx, sizeof(func_stack_t)); + + new_func->var_head = new_func->var_tail = NULL; + + new_func->next = ctx->func_stack; + ctx->func_stack = new_func; +} + +static source_elements_t *function_body_parsed(parser_ctx_t *ctx, source_elements_t *source) +{ + source->variables = ctx->func_stack->var_head; + pop_func(ctx); + + return source; +} + static void program_parsed(parser_ctx_t *ctx, source_elements_t *source) { + source->variables = ctx->func_stack->var_head; + pop_func(ctx); + ctx->source = source; ctx->hres = S_OK; } @@ -1553,6 +1594,8 @@ HRESULT script_parse(script_ctx_t *ctx, const WCHAR *code, parser_ctx_t **ret) mark = jsheap_mark(&ctx->tmp_heap); jsheap_init(&parser_ctx->heap); + push_func(parser_ctx); + parser_parse(parser_ctx); jsheap_clear(mark); if(FAILED(parser_ctx->hres)) { diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 9bbdafe..de45d59 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -721,4 +721,22 @@ tmp.testWith = true; with(tmp) ok(testWith === true, "testWith !== true"); +if(false) { + var varTest1 = true; +} + +ok(varTest1 === undefined, "varTest1 = " + varTest1); +ok(varTest2 === undefined, "varTest2 = " + varTest1); + +var varTest2; + +function varTestFunc(varTest3) { + var varTest3; + + ok(varTest3 === 3, "varTest3 = " + varTest3); + ok(varTest4 === undefined, "varTest4 = " + varTest4); + + var varTest4; +} + reportSuccess();

1 0

Jacek Caban : jscript: Optimize GetDispID usage.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: 131d0b9f1be05b51a9d54bd2fcc6999facf559ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=131d0b9f1be05b51a9d54bd2f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 17:47:24 2008 +0200 jscript: Optimize GetDispID usage. --- dlls/jscript/dispex.c | 31 +++++++++++++++++++------------ dlls/jscript/engine.c | 18 ++++++------------ dlls/jscript/jscript.h | 1 + 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 896af91..81fec89 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -517,8 +517,6 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { DispatchEx *This = DISPATCHEX_THIS(iface); - dispex_prop_t *prop; - HRESULT hres; TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); @@ -527,16 +525,7 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW return E_NOTIMPL; } - hres = find_prop_name_prot(This, bstrName, (grfdex&fdexNameEnsure) != 0, &prop); - if(FAILED(hres)) - return hres; - if(prop) { - *pid = prop_to_id(This, prop); - return S_OK; - } - - TRACE("not found %s\n", debugstr_w(bstrName)); - return DISP_E_UNKNOWNNAME; + return jsdisp_get_id(This, bstrName, grfdex, pid); } static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, @@ -800,6 +789,24 @@ DispatchEx *iface_to_jsdisp(IUnknown *iface) return ret; } +HRESULT jsdisp_get_id(DispatchEx *jsdisp, const WCHAR *name, DWORD flags, DISPID *id) +{ + dispex_prop_t *prop; + HRESULT hres; + + hres = find_prop_name_prot(jsdisp, name, (flags&fdexNameEnsure) != 0, &prop); + if(FAILED(hres)) + return hres; + + if(prop) { + *id = prop_to_id(jsdisp, prop); + return S_OK; + } + + TRACE("not found %s\n", debugstr_w(name)); + return DISP_E_UNKNOWNNAME; +} + HRESULT jsdisp_call_value(DispatchEx *disp, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index a3e0fc1..5d231f2 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -203,13 +203,6 @@ void exec_release(exec_ctx_t *ctx) heap_free(ctx); } -static HRESULT dispex_get_id(IDispatchEx *dispex, BSTR name, DWORD flags, DISPID *id) -{ - *id = 0; - - return IDispatchEx_GetDispID(dispex, name, flags|fdexNameCaseSensitive, id); -} - static HRESULT disp_get_id(IDispatch *disp, BSTR name, DWORD flags, DISPID *id) { IDispatchEx *dispex; @@ -223,7 +216,8 @@ static HRESULT disp_get_id(IDispatch *disp, BSTR name, DWORD flags, DISPID *id) return IDispatch_GetIDsOfNames(disp, &IID_NULL, &name, 1, 0, id); } - hres = dispex_get_id(dispex, name, flags, id); + *id = 0; + hres = IDispatchEx_GetDispID(dispex, name, flags|fdexNameCaseSensitive, id); IDispatchEx_Release(dispex); return hres; } @@ -433,7 +427,7 @@ static HRESULT identifier_eval(exec_ctx_t *ctx, BSTR identifier, DWORD flags, ex TRACE("%s\n", debugstr_w(identifier)); for(scope = ctx->scope_chain; scope; scope = scope->next) { - hres = dispex_get_id(_IDispatchEx_(scope->obj), identifier, 0, &id); + hres = jsdisp_get_id(scope->obj, identifier, 0, &id); if(SUCCEEDED(hres)) break; } @@ -443,7 +437,7 @@ static HRESULT identifier_eval(exec_ctx_t *ctx, BSTR identifier, DWORD flags, ex return S_OK; } - hres = dispex_get_id(_IDispatchEx_(ctx->parser->script->global), identifier, 0, &id); + hres = jsdisp_get_id(ctx->parser->script->global, identifier, 0, &id); if(SUCCEEDED(hres)) { exprval_set_idref(ret, (IDispatch*)_IDispatchEx_(ctx->parser->script->global), id); return S_OK; @@ -460,14 +454,14 @@ static HRESULT identifier_eval(exec_ctx_t *ctx, BSTR identifier, DWORD flags, ex return S_OK; } - hres = dispex_get_id(_IDispatchEx_(ctx->parser->script->script_disp), identifier, 0, &id); + hres = jsdisp_get_id(ctx->parser->script->script_disp, identifier, 0, &id); if(SUCCEEDED(hres)) { exprval_set_idref(ret, (IDispatch*)_IDispatchEx_(ctx->parser->script->script_disp), id); return S_OK; } if(flags & EXPR_NEWREF) { - hres = dispex_get_id(_IDispatchEx_(ctx->var_disp), identifier, fdexNameEnsure, &id); + hres = jsdisp_get_id(ctx->var_disp, identifier, fdexNameEnsure, &id); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index e4b0d1c..15e4b35 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -127,6 +127,7 @@ HRESULT disp_propput(IDispatch*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvide HRESULT jsdisp_propput_name(DispatchEx*,const WCHAR*,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_propput_idx(DispatchEx*,DWORD,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_propget_idx(DispatchEx*,DWORD,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); +HRESULT jsdisp_get_id(DispatchEx*,const WCHAR*,DWORD,DISPID*); HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,DWORD,DispatchEx*,DispatchEx**);

1 0

Jacek Caban : mshtml: Ignore IDispatchJS in QueryInterface.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: b54f449e2d2514e3545d10e8e973339f8b55a2c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b54f449e2d2514e3545d10e8e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 17:46:30 2008 +0200 mshtml: Ignore IDispatchJS in QueryInterface. --- dlls/mshtml/dispex.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 37deec6..b95a0cb 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -655,6 +655,8 @@ BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv) { static const IID IID_UndocumentedScriptIface = {0x719c3050,0xf9d3,0x11cf,{0xa4,0x93,0x00,0x40,0x05,0x23,0xa8,0xa0}}; + static const IID IID_IDispatchJS = + {0x719c3050,0xf9d3,0x11cf,{0xa4,0x93,0x00,0x40,0x05,0x23,0xa8,0xa6}}; if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); @@ -662,6 +664,9 @@ BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); *ppv = DISPATCHEX(This); + }else if(IsEqualGUID(&IID_IDispatchJS, riid)) { + TRACE("(%p)->(IID_IDispatchJS %p) returning NULL\n", This, ppv); + *ppv = NULL; }else if(IsEqualGUID(&IID_UndocumentedScriptIface, riid)) { TRACE("(%p)->(IID_UndocumentedScriptIface %p) returning NULL\n", This, ppv); *ppv = NULL;

1 0

Jacek Caban : mshtml: Added IHTMLTableRow::get_cells implementation.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: e80c55c367414f59961d1461e60760952d0bacc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e80c55c367414f59961d1461e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 17:46:02 2008 +0200 mshtml: Added IHTMLTableRow::get_cells implementation. --- dlls/mshtml/htmltablerow.c | 28 ++++++++++++++++++++++- dlls/mshtml/nsiface.idl | 25 +++++++++++++++++++++ dlls/mshtml/tests/dom.c | 52 +++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 100 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index aaf0567..77d8221 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -35,6 +35,8 @@ typedef struct { HTMLElement element; const IHTMLTableRowVtbl *lpHTMLTableRowVtbl; + + nsIDOMHTMLTableRowElement *nsrow; } HTMLTableRow; #define HTMLTABLEROW(x) ((IHTMLTableRow*) &(x)->lpHTMLTableRowVtbl) @@ -194,8 +196,21 @@ static HRESULT WINAPI HTMLTableRow_get_selectionRowIndex(IHTMLTableRow *iface, l static HRESULT WINAPI HTMLTableRow_get_cells(IHTMLTableRow *iface, IHTMLElementCollection **p) { HTMLTableRow *This = HTMLTABLEROW_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMHTMLCollection *nscol; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLTableRowElement_GetCells(This->nsrow, &nscol); + if(NS_FAILED(nsres)) { + ERR("GetCells failed: %08x\n", nsres); + return E_FAIL; + } + + *p = create_collection_from_htmlcol(This->element.node.doc, (IUnknown*)HTMLTABLEROW(This), nscol); + + nsIDOMHTMLCollection_Release(nscol); + return S_OK; } static HRESULT WINAPI HTMLTableRow_insertCell(IHTMLTableRow *iface, long index, IDispatch **row) @@ -271,6 +286,10 @@ static HRESULT HTMLTableRow_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) static void HTMLTableRow_destructor(HTMLDOMNode *iface) { HTMLTableRow *This = HTMLTABLEROW_NODE_THIS(iface); + + if(This->nsrow) + nsIDOMHTMLTableRowElement_Release(This->nsrow); + HTMLElement_destructor(&This->element.node); } @@ -300,6 +319,7 @@ static dispex_static_data_t HTMLTableRow_dispex = { HTMLElement *HTMLTableRow_Create(nsIDOMHTMLElement *nselem) { HTMLTableRow *ret = heap_alloc_zero(sizeof(HTMLTableRow)); + nsresult nsres; ret->lpHTMLTableRowVtbl = &HTMLTableRowVtbl; ret->element.node.vtbl = &HTMLTableRowImplVtbl; @@ -307,5 +327,9 @@ HTMLElement *HTMLTableRow_Create(nsIDOMHTMLElement *nselem) init_dispex(&ret->element.node.dispex, (IUnknown*)HTMLTABLEROW(ret), &HTMLTableRow_dispex); HTMLElement_Init(&ret->element); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTableRowElement, (void**)&ret->nsrow); + if(NS_FAILED(nsres)) + ERR("Could not get nsIDOMHTMLTableRowElement iface: %08x\n", nsres); + return &ret->element; } diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 5e92dc5..bedac82 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -1389,6 +1389,31 @@ interface nsIDOMHTMLTableElement : nsIDOMHTMLElement [ object, + uuid(a6cf90b6-15b3-11d2-932e-00805f8add32), + local + /* FROZEN */ +] +interface nsIDOMHTMLTableRowElement : nsIDOMHTMLElement +{ + nsresult GetRowIndex(PRInt32 *aRowIndex); + nsresult GetSectionRowIndex(PRInt32 *aSectionRowIndex); + nsresult GetCells(nsIDOMHTMLCollection **aCells); + nsresult GetAlign(nsAString *aAlign); + nsresult SetAlign(const nsAString *aAlign); + nsresult GetBgColor(nsAString *aBgColor); + nsresult SetBgColor(const nsAString *aBgColor); + nsresult GetCh(nsAString *aCh); + nsresult SetCh(const nsAString *aCh); + nsresult GetChOff(nsAString *aChOff); + nsresult SetChOff(const nsAString *aChOff); + nsresult GetVAlign(nsAString *aVAlign); + nsresult SetVAlign(const nsAString *aVAlign); + nsresult InsertCell(PRInt32 index, nsIDOMHTMLElement **_retval); + nsresult DeleteCell(PRInt32 index); +} + +[ + object, uuid(94928ab3-8b63-11d3-989d-001083010e9b), local /* FROZEN */ diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 6e05ebb..199248b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -45,7 +45,7 @@ static const char elem_test_str[] = "<input id=\"in\" class=\"testclass\" tabIndex=\"2\" title=\"test title\" />" "<select id=\"s\"><option id=\"x\" value=\"val1\">opt1</option><option id=\"y\">opt2</option></select>" "<textarea id=\"X\">text text</textarea>" - "<table id=\"tbl\"><tbody><tr></tr><tr id=\"row2\"></tr></tbody></table>" + "<table id=\"tbl\"><tbody><tr></tr><tr id=\"row2\"><td>td1 text</td><td>td2 text</td></tr></tbody></table>" "<script id=\"sc\" type=\"text/javascript\"></script>" "<test />" "<img id=\"imgid\"/>" @@ -85,7 +85,8 @@ typedef enum { ET_TESTG, ET_COMMENT, ET_IMG, - ET_TR + ET_TR, + ET_TD } elem_type_t; static const IID * const none_iids[] = { @@ -247,6 +248,16 @@ static const IID * const tr_iids[] = { NULL }; +static const IID * const td_iids[] = { + &IID_IHTMLDOMNode, + &IID_IHTMLDOMNode2, + &IID_IHTMLElement, + &IID_IHTMLElement2, + &IID_IDispatchEx, + &IID_IConnectionPointContainer, + NULL +}; + static const IID * const generic_iids[] = { &IID_IHTMLDOMNode, &IID_IHTMLDOMNode2, @@ -286,7 +297,8 @@ static const elem_type_info_t elem_type_infos[] = { {"TEST", generic_iids, &DIID_DispHTMLGenericElement}, {"!", comment_iids, &DIID_DispHTMLCommentElement}, {"IMG", img_iids, &DIID_DispHTMLImg}, - {"TR", tr_iids, &DIID_DispHTMLTableRow} + {"TR", tr_iids, &DIID_DispHTMLTableRow}, + {"TD", td_iids, NULL} }; static const char *dbgstr_w(LPCWSTR str) @@ -2243,6 +2255,30 @@ static void test_defaults(IHTMLDocument2 *doc) test_doc_title(doc, ""); } +static void test_tr_elem(IHTMLElement *elem) +{ + IHTMLElementCollection *col; + IHTMLTableRow *row; + HRESULT hres; + + static const elem_type_t cell_types[] = {ET_TD,ET_TD}; + + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLTableRow, (void**)&row); + ok(hres == S_OK, "Could not get IHTMLTableRow iface: %08x\n", hres); + if(FAILED(hres)) + return; + + col = NULL; + hres = IHTMLTableRow_get_cells(row, &col); + ok(hres == S_OK, "get_cells failed: %08x\n", hres); + ok(col != NULL, "get_cells returned NULL\n"); + + test_elem_collection((IUnknown*)col, cell_types, sizeof(cell_types)/sizeof(*cell_types)); + IHTMLElementCollection_Release(col); + + IHTMLTable_Release(row); +} + static void test_table_elem(IHTMLElement *elem) { IHTMLElementCollection *col; @@ -2384,6 +2420,7 @@ static void test_elems(IHTMLDocument2 *doc) static const WCHAR scW[] = {'s','c',0}; static const WCHAR xxxW[] = {'x','x','x',0}; static const WCHAR tblW[] = {'t','b','l',0}; + static const WCHAR row2W[] = {'r','o','w','2',0}; static const elem_type_t all_types[] = { ET_HTML, @@ -2402,6 +2439,8 @@ static void test_elems(IHTMLDocument2 *doc) ET_TBODY, ET_TR, ET_TR, + ET_TD, + ET_TD, ET_SCRIPT, ET_TEST, ET_IMG @@ -2570,6 +2609,13 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + elem = get_doc_elem_by_id(doc, row2W); + ok(elem != NULL, "elem == NULL\n"); + if(elem) { + test_tr_elem(elem); + IHTMLElement_Release(elem); + } + hres = IHTMLDocument2_get_body(doc, &elem); ok(hres == S_OK, "get_body failed: %08x\n", hres);

1 0