June 2015 - Wine-commits - list.winehq.org

Piotr Caban : msvcrt: Get rid of msvcrt_fdtoh helper.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: 86baccc9ae9f79cc542c53e31edfdc9bf8f99a8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=86baccc9ae9f79cc542c53e31… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 3 13:25:47 2015 +0200 msvcrt: Get rid of msvcrt_fdtoh helper. --- dlls/msvcrt/file.c | 24 +++--------------------- dlls/msvcrt/tests/file.c | 5 +++++ 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 7bdb468..d7a8f3a 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -309,26 +309,6 @@ static inline BOOL msvcrt_is_valid_fd(int fd) return fd >= 0 && fd < MSVCRT_fdend && (get_ioinfo_nolock(fd)->wxflag & WX_OPEN); } -/* INTERNAL: Get the HANDLE for a fd - * This doesn't lock the table, because a failure will result in - * INVALID_HANDLE_VALUE being returned, which should be handled correctly. If - * it returns a valid handle which is about to be closed, a subsequent call - * will fail, most likely in a sane way. - */ -static HANDLE msvcrt_fdtoh(int fd) -{ - if (!msvcrt_is_valid_fd(fd)) - { - WARN(":fd (%d) - no handle!\n",fd); - *MSVCRT___doserrno() = 0; - *MSVCRT__errno() = MSVCRT_EBADF; - return INVALID_HANDLE_VALUE; - } - if (get_ioinfo_nolock(fd)->handle == INVALID_HANDLE_VALUE) - WARN("returning INVALID_HANDLE_VALUE for %d\n", fd); - return get_ioinfo_nolock(fd)->handle; -} - /* INTERNAL: free a file entry fd */ static void msvcrt_free_fd(int fd) { @@ -1848,9 +1828,11 @@ int CDECL _futime(int fd, struct MSVCRT___utimbuf32 *t) */ MSVCRT_intptr_t CDECL MSVCRT__get_osfhandle(int fd) { - HANDLE hand = msvcrt_fdtoh(fd); + HANDLE hand = get_ioinfo_nolock(fd)->handle; TRACE(":fd (%d) handle (%p)\n",fd,hand); + if(hand == INVALID_HANDLE_VALUE) + *MSVCRT__errno() = MSVCRT_EBADF; return (MSVCRT_intptr_t)hand; } diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 860db6a..c4d8fa1 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1850,6 +1850,11 @@ static void test_get_osfhandle(void) _close(fd); _unlink(fname); + + errno = 0xdeadbeef; + handle = (HANDLE)_get_osfhandle(fd); + ok(handle == INVALID_HANDLE_VALUE, "_get_osfhandle returned %p\n", handle); + ok(errno == EBADF, "errno = %d\n", errno); } static void test_setmaxstdio(void)

1 0

Piotr Caban : msvcrt: Use fd critical section in msvcrt_create_io_inherit_block.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: 9ce2a8a60c14cfeac737f8dcfad8f8325265405a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce2a8a60c14cfeac737f8dcf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 3 13:25:52 2015 +0200 msvcrt: Use fd critical section in msvcrt_create_io_inherit_block. --- dlls/msvcrt/file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index d7a8f3a..1d144b2 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -498,7 +498,7 @@ unsigned msvcrt_create_io_inherit_block(WORD *size, BYTE **block) for (fd = 0; fd < MSVCRT_fdend; fd++) { /* to be inherited, we need it to be open, and that DONTINHERIT isn't set */ - fdinfo = get_ioinfo_nolock(fd); + fdinfo = get_ioinfo(fd); if ((fdinfo->wxflag & (WX_OPEN | WX_DONTINHERIT)) == WX_OPEN) { *wxflag_ptr = fdinfo->wxflag; @@ -509,6 +509,7 @@ unsigned msvcrt_create_io_inherit_block(WORD *size, BYTE **block) *wxflag_ptr = 0; *handle_ptr = INVALID_HANDLE_VALUE; } + release_ioinfo(fdinfo); wxflag_ptr++; handle_ptr++; } return TRUE;

1 0

Piotr Caban : msvcrt: Get rid of msvcrt_is_valid_fd helper.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: bd6eaf918c50642423b00b4be8eaa933a9e77135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd6eaf918c50642423b00b4be… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 3 13:26:00 2015 +0200 msvcrt: Get rid of msvcrt_is_valid_fd helper. --- dlls/msvcrt/file.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1d144b2..5644a61 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -304,11 +304,6 @@ static inline MSVCRT_FILE* msvcrt_get_file(int i) return &ret->file; } -static inline BOOL msvcrt_is_valid_fd(int fd) -{ - return fd >= 0 && fd < MSVCRT_fdend && (get_ioinfo_nolock(fd)->wxflag & WX_OPEN); -} - /* INTERNAL: free a file entry fd */ static void msvcrt_free_fd(int fd) { @@ -454,7 +449,7 @@ static MSVCRT_FILE* msvcrt_alloc_fp(void) static int msvcrt_init_fp(MSVCRT_FILE* file, int fd, unsigned stream_flags) { TRACE(":fd (%d) allocating FILE*\n",fd); - if (!msvcrt_is_valid_fd(fd)) + if (!(get_ioinfo_nolock(fd)->wxflag & WX_OPEN)) { WARN(":invalid fd %d\n",fd); *MSVCRT___doserrno() = 0;

1 0

Nikolay Sivov : winebuild: Remove always false condition (Coverity).
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: 233c8c163b28bb1dddc09d75eb03a257b92504f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=233c8c163b28bb1dddc09d75e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 14:25:52 2015 +0300 winebuild: Remove always false condition (Coverity). --- tools/winebuild/spec32.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 98060b5..c27f0dd 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -863,8 +863,6 @@ void output_def_file( DLLSPEC *spec, int include_private ) const ORDDEF *odp = &spec->entry_points[i]; int is_data = 0; - if (!odp) continue; - if (odp->name) name = odp->name; else if (odp->export_name) name = odp->export_name; else continue;

1 0

Nikolay Sivov : mshtml: Handle allocation failure during collection creation (Coverity).
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: a260d3efc625e763c12986cc101a113ca1e4bd73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a260d3efc625e763c12986cc1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 14:36:02 2015 +0300 mshtml: Handle allocation failure during collection creation (Coverity). --- dlls/mshtml/htmlelemcol.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index a57f39e..c6c65b1 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -824,6 +824,9 @@ static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement **elems, { HTMLElementCollection *ret = heap_alloc_zero(sizeof(HTMLElementCollection)); + if (!ret) + return NULL; + ret->IHTMLElementCollection_iface.lpVtbl = &HTMLElementCollectionVtbl; ret->ref = 1; ret->elems = elems;

1 0

Nikolay Sivov : oleaut32: Improve error handling in GetRecordInfoFromTypeInfo() (Coverity).
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: 8d4f56810775757edc87f6f01754df7f9e98d7e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d4f56810775757edc87f6f01… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 16:04:16 2015 +0300 oleaut32: Improve error handling in GetRecordInfoFromTypeInfo() (Coverity). --- dlls/oleaut32/recinfo.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/recinfo.c b/dlls/oleaut32/recinfo.c index f60fb8a..ec65a52 100644 --- a/dlls/oleaut32/recinfo.c +++ b/dlls/oleaut32/recinfo.c @@ -650,7 +650,12 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo WARN("GetRefTypeInfo failed: %08x\n", hres); return hres; } - ITypeInfo_GetTypeAttr(pTypeInfo, &typeattr); + hres = ITypeInfo_GetTypeAttr(pTypeInfo, &typeattr); + if(FAILED(hres)) { + ITypeInfo_Release(pTypeInfo); + WARN("GetTypeAttr failed for referenced type: %08x\n", hres); + return hres; + } }else { pTypeInfo = pTI; ITypeInfo_AddRef(pTypeInfo);

1 0

Jacek Caban : jscript: Added beginning support for 'automagic' event binding feature.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: 170bb3771f43f1120435e98ea38543d5a667f9bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=170bb3771f43f1120435e98ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 2 14:45:10 2015 +0200 jscript: Added beginning support for 'automagic' event binding feature. --- dlls/jscript/compile.c | 18 ++++++++++----- dlls/jscript/engine.c | 60 ++++++++++++++++++++++++++++++++++++++++++-------- dlls/jscript/engine.h | 1 + dlls/jscript/lex.c | 8 ++++++- dlls/jscript/parser.h | 1 + dlls/jscript/parser.y | 17 +++++++++----- 6 files changed, 84 insertions(+), 21 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index f056be1..52e6b66 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -862,7 +862,7 @@ static HRESULT compile_function_expression(compiler_ctx_t *ctx, function_express ctx->func_tail = ctx->func_tail ? (ctx->func_tail->next = expr) : (ctx->func_head = expr); /* FIXME: not exactly right */ - if(expr->identifier) { + if(expr->identifier && !expr->event_target) { ctx->func->func_cnt++; return push_instr_bstr(ctx, OP_ident, expr->identifier); } @@ -1865,10 +1865,18 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, func->instr_off = off; - if(func_expr && func_expr->identifier) { - func->name = compiler_alloc_bstr(ctx, func_expr->identifier); - if(!func->name) - return E_OUTOFMEMORY; + if(func_expr) { + if(func_expr->identifier) { + func->name = compiler_alloc_bstr(ctx, func_expr->identifier); + if(!func->name) + return E_OUTOFMEMORY; + } + + if(func_expr->event_target) { + func->event_target = compiler_alloc_bstr(ctx, func_expr->event_target); + if(!func->event_target) + return E_OUTOFMEMORY; + } } if(func_expr) { diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index de60755..ca08d91 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -511,14 +511,16 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re TRACE("%s\n", debugstr_w(identifier)); - for(scope = ctx->exec_ctx->scope_chain; scope; scope = scope->next) { - if(scope->jsobj) - hres = jsdisp_get_id(scope->jsobj, identifier, fdexNameImplicit, &id); - else - hres = disp_get_id(ctx, scope->obj, identifier, identifier, fdexNameImplicit, &id); - if(SUCCEEDED(hres)) { - exprval_set_idref(ret, scope->obj, id); - return S_OK; + if(ctx->exec_ctx) { + for(scope = ctx->exec_ctx->scope_chain; scope; scope = scope->next) { + if(scope->jsobj) + hres = jsdisp_get_id(scope->jsobj, identifier, fdexNameImplicit, &id); + else + hres = disp_get_id(ctx, scope->obj, identifier, identifier, fdexNameImplicit, &id); + if(SUCCEEDED(hres)) { + exprval_set_idref(ret, scope->obj, id); + return S_OK; + } } } @@ -2504,6 +2506,43 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, bytecode_t *code, function_code return S_OK; } +static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdisp_t *func_obj) +{ + IBindEventHandler *target; + exprval_t exprval; + IDispatch *disp; + jsval_t v; + HRESULT hres; + + hres = identifier_eval(ctx, func->event_target, &exprval); + if(FAILED(hres)) + return hres; + + hres = exprval_to_value(ctx, &exprval, &v); + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + if(!is_object_instance(v)) { + FIXME("Can't bind to %s\n", debugstr_jsval(v)); + jsval_release(v); + } + + disp = get_object(v); + hres = IDispatch_QueryInterface(disp, &IID_IBindEventHandler, (void**)&target); + if(SUCCEEDED(hres)) { + hres = IBindEventHandler_BindHandler(target, func->name, (IDispatch*)&func_obj->IDispatchEx_iface); + IBindEventHandler_Release(target); + if(FAILED(hres)) + WARN("BindEvent failed: %08x\n", hres); + }else { + FIXME("No IBindEventHandler, not yet supported binding\n"); + } + + IDispatch_Release(disp); + return hres; +} + HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, BOOL from_eval, jsval_t *ret) { exec_ctx_t *prev_ctx; @@ -2521,7 +2560,10 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, BO if(FAILED(hres)) return hres; - hres = jsdisp_propput_name(ctx->var_disp, func->funcs[i].name, jsval_obj(func_obj)); + if(func->funcs[i].event_target) + hres = bind_event_target(ctx->script, func->funcs+i, func_obj); + else + hres = jsdisp_propput_name(ctx->var_disp, func->funcs[i].name, jsval_obj(func_obj)); jsdisp_release(func_obj); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index bd49c99..dd8ed4c 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -127,6 +127,7 @@ typedef struct { typedef struct _function_code_t { BSTR name; + BSTR event_target; unsigned instr_off; const WCHAR *source; diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index af4b24b..57ab033 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -590,7 +590,6 @@ static int next_token(parser_ctx_t *ctx, void *lval) case ',': case '~': case '?': - case ':': return *ctx->ptr++; case '}': @@ -786,6 +785,13 @@ static int next_token(parser_ctx_t *ctx, void *lval) } return '/'; + case ':': + if(++ctx->ptr < ctx->end && *ctx->ptr == ':') { + ctx->ptr++; + return kDCOL; + } + return ':'; + case '\"': case '\'': return parse_string_literal(ctx, lval, *ctx->ptr); diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index ab5744a..f8d404f 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -285,6 +285,7 @@ struct _source_elements_t { typedef struct _function_expression_t { expression_t expr; const WCHAR *identifier; + const WCHAR *event_target; parameter_t *parameter_list; source_elements_t *source_elements; const WCHAR *src_str; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 7b36b11..59e6757 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -120,7 +120,7 @@ static parameter_list_t *parameter_list_add(parser_ctx_t*,parameter_list_t*,cons static void *new_expression(parser_ctx_t *ctx,expression_type_t,size_t); static expression_t *new_function_expression(parser_ctx_t*,const WCHAR*,parameter_list_t*, - source_elements_t*,const WCHAR*,DWORD); + source_elements_t*,const WCHAR*,const WCHAR*,DWORD); static expression_t *new_binary_expression(parser_ctx_t*,expression_type_t,expression_t*,expression_t*); static expression_t *new_unary_expression(parser_ctx_t*,expression_type_t,expression_t*); static expression_t *new_conditional_expression(parser_ctx_t*,expression_t*,expression_t*,expression_t*); @@ -166,7 +166,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state /* keywords */ %token kBREAK kCASE kCATCH kCONTINUE kDEFAULT kDELETE kDO kELSE kIF kFINALLY kFOR kIN %token kINSTANCEOF kNEW kNULL kRETURN kSWITCH kTHIS kTHROW kTRUE kFALSE kTRY kTYPEOF kVAR kVOID kWHILE kWITH -%token tANDAND tOROR tINC tDEC tHTMLCOMMENT kDIVEQ +%token tANDAND tOROR tINC tDEC tHTMLCOMMENT kDIVEQ kDCOL %token <srcptr> kFUNCTION '}' @@ -264,8 +264,12 @@ SourceElements /* ECMA-262 3rd Edition 13 */ FunctionExpression - : KFunction Identifier_opt left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' - { $$ = new_function_expression(ctx, $2, $4, $7, $1, $8-$1+1); } + : KFunction left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' + { $$ = new_function_expression(ctx, NULL, $3, $6, NULL, $1, $7-$1+1); } + | KFunction tIdentifier left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' + { $$ = new_function_expression(ctx, $2, $4, $7, NULL, $1, $8-$1+1); } + | KFunction tIdentifier kDCOL tIdentifier left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' + { $$ = new_function_expression(ctx, $4, $6, $9, $2, $1, $10-$1+1); } KFunction : kFUNCTION { $$ = $1; } @@ -1300,14 +1304,15 @@ static parameter_list_t *parameter_list_add(parser_ctx_t *ctx, parameter_list_t return list; } -static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *identifier, - parameter_list_t *parameter_list, source_elements_t *source_elements, const WCHAR *src_str, DWORD src_len) +static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *identifier, parameter_list_t *parameter_list, + source_elements_t *source_elements, const WCHAR *event_target, const WCHAR *src_str, DWORD src_len) { function_expression_t *ret = new_expression(ctx, EXPR_FUNC, sizeof(*ret)); ret->identifier = identifier; ret->parameter_list = parameter_list ? parameter_list->head : NULL; ret->source_elements = source_elements; + ret->event_target = event_target; ret->src_str = src_str; ret->src_len = src_len; ret->next = NULL;

1 0

Jacek Caban : jscript: Added 'automagic' test.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: 326c1e61b453eb7857c1c45753e341dde1d2ba6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=326c1e61b453eb7857c1c4575… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 2 14:45:20 2015 +0200 jscript: Added 'automagic' test. --- dlls/jscript/tests/run.c | 132 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 40a1245..6259071 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -110,6 +110,7 @@ DEFINE_EXPECT(ActiveScriptSite_OnScriptError); DEFINE_EXPECT(invoke_func); DEFINE_EXPECT(DeleteMemberByDispID); DEFINE_EXPECT(DeleteMemberByDispID_false); +DEFINE_EXPECT(BindHandler); #define DISPID_GLOBAL_TESTPROPGET 0x1000 #define DISPID_GLOBAL_TESTPROPPUT 0x1001 @@ -140,6 +141,7 @@ DEFINE_EXPECT(DeleteMemberByDispID_false); #define DISPID_GLOBAL_DISPEXFUNC 0x101a #define DISPID_GLOBAL_TESTPROPPUTREF 0x101b #define DISPID_GLOBAL_GETSCRIPTSTATE 0x101c +#define DISPID_GLOBAL_BINDEVENTHANDLER 0x101d #define DISPID_GLOBAL_TESTPROPDELETE 0x2000 #define DISPID_GLOBAL_TESTNOPROPDELETE 0x2001 @@ -273,6 +275,13 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW return E_NOTIMPL; } +static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *res, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) { ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); @@ -583,6 +592,75 @@ static IDispatchExVtbl pureDispVtbl = { static IDispatchEx pureDisp = { &pureDispVtbl }; +static HRESULT WINAPI BindEventHandler_QueryInterface(IBindEventHandler *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI BindEventHandler_AddRef(IBindEventHandler *iface) +{ + return 2; +} + +static ULONG WINAPI BindEventHandler_Release(IBindEventHandler *iface) +{ + return 1; +} + +static HRESULT WINAPI BindEventHandler_BindHandler(IBindEventHandler *iface, const WCHAR *event, IDispatch *disp) +{ + CHECK_EXPECT(BindHandler); + ok(!strcmp_wa(event, "eventName"), "event = %s\n", wine_dbgstr_w(event)); + ok(disp != NULL, "disp = NULL\n"); + return S_OK; +} + +static const IBindEventHandlerVtbl BindEventHandlerVtbl = { + BindEventHandler_QueryInterface, + BindEventHandler_AddRef, + BindEventHandler_Release, + BindEventHandler_BindHandler +}; + +static IBindEventHandler BindEventHandler = { &BindEventHandlerVtbl }; + +static HRESULT WINAPI bindEventHandlerDisp_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDispatch) || IsEqualGUID(riid, &IID_IDispatchEx)) { + *ppv = iface; + return S_OK; + } + + if(IsEqualGUID(riid, &IID_IBindEventHandler)) { + *ppv = &BindEventHandler; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static IDispatchExVtbl bindEventHandlerDispVtbl = { + bindEventHandlerDisp_QueryInterface, + DispatchEx_AddRef, + DispatchEx_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + DispatchEx_Invoke, + DispatchEx_GetDispID, + DispatchEx_InvokeEx, + DispatchEx_DeleteMemberByName, + DispatchEx_DeleteMemberByDispID, + DispatchEx_GetMemberProperties, + DispatchEx_GetMemberName, + DispatchEx_GetNextDispID, + DispatchEx_GetNameSpaceParent +}; + +static IDispatchEx bindEventHandlerDisp = { &bindEventHandlerDispVtbl }; + static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { if(!strcmp_wa(bstrName, "ok")) { @@ -763,6 +841,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD return S_OK; } + if(!strcmp_wa(bstrName, "bindEventHandler")) { + *pid = DISPID_GLOBAL_BINDEVENTHANDLER; + return S_OK; + } + if(strict_dispid_check && strcmp_wa(bstrName, "t")) ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); return DISP_E_UNKNOWNNAME; @@ -1127,6 +1210,11 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; } + case DISPID_GLOBAL_BINDEVENTHANDLER: + V_VT(pvarRes) = VT_DISPATCH; + V_DISPATCH(pvarRes) = (IDispatch*)&bindEventHandlerDisp; + return S_OK; + case DISPID_GLOBAL_PROPARGPUT: CHECK_EXPECT(global_propargput_i); ok(wFlags == INVOKE_PROPERTYPUT, "wFlags = %x\n", wFlags); @@ -1974,6 +2062,49 @@ static void test_start(void) script_engine = NULL; } +static void test_automagic(void) +{ + IActiveScriptParse *parser; + IActiveScript *engine; + BSTR str; + HRESULT hres; + + script_engine = engine = create_script(); + if(!engine) + return; + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + hres = IActiveScriptParse_InitNew(parser); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + + hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + + hres = IActiveScript_AddNamedItem(engine, testW, SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); + ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); + + str = a2bstr("function bindEventHandler::eventName() {}\n" + "reportSuccess();"); + hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + SysFreeString(str); + + SET_EXPECT(BindHandler); + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + CHECK_CALLED(BindHandler); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + + IActiveScript_Release(engine); + IActiveScriptParse_Release(parser); + script_engine = NULL; +} + static HRESULT parse_script_expr(const char *expr, VARIANT *res, IActiveScript **engine_ret) { IActiveScriptParse *parser; @@ -2502,6 +2633,7 @@ static BOOL run_tests(void) test_isvisible(FALSE); test_isvisible(TRUE); test_start(); + test_automagic(); parse_script_af(0, "test.testThis2(this);"); parse_script_af(0, "(function () { test.testThis2(this); })();");

1 0

Jacek Caban : mshtml: Fixed leak in HTMLCurrentStyle_Create.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: f5066488e9cb1ea5c7459f397e7da1598f22aa54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5066488e9cb1ea5c7459f397… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 2 16:01:20 2015 +0200 mshtml: Fixed leak in HTMLCurrentStyle_Create. --- dlls/mshtml/htmlcurstyle.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index f0b0d98..bf46cfc 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -1338,6 +1338,7 @@ HRESULT HTMLCurrentStyle_Create(HTMLElement *elem, IHTMLCurrentStyle **p) nsAString_Init(&nsempty_str, NULL); nsres = nsIDOMWindow_GetComputedStyle(nsview, (nsIDOMElement*)elem->nselem, &nsempty_str, &nsstyle); nsAString_Finish(&nsempty_str); + nsIDOMWindow_Release(nsview); if(NS_FAILED(nsres)) { ERR("GetComputedStyle failed: %08x\n", nsres); return E_FAIL;

1 0

Alexandre Julliard : user32: Get rid of the unused parameter in the EmptyClipboard driver entry point.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: b7c340de730eec2f3546f5cb63328d6f8cb8c042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7c340de730eec2f3546f5cb6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 16:38:44 2015 +0900 user32: Get rid of the unused parameter in the EmptyClipboard driver entry point. --- dlls/user32/clipboard.c | 3 +-- dlls/user32/driver.c | 6 +++--- dlls/user32/user_private.h | 2 +- dlls/winemac.drv/clipboard.c | 4 ++-- dlls/winemac.drv/winemac.drv.spec | 2 +- dlls/winex11.drv/clipboard.c | 25 ++++++++++++++----------- dlls/winex11.drv/winex11.drv.spec | 2 +- 7 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index de1ec60..666acf0 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -299,8 +299,7 @@ BOOL WINAPI EmptyClipboard(void) * to clear its cache. */ USER_Driver->pAcquireClipboard(cbinfo.hWndOpen); - /* Empty the local cache */ - USER_Driver->pEmptyClipboard(FALSE); + USER_Driver->pEmptyClipboard(); bCBHasChanged = TRUE; diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index e0bc38c..400d30a 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -344,7 +344,7 @@ static BOOL CDECL nulldrv_CountClipboardFormats(void) return 0; } -static void CDECL nulldrv_EmptyClipboard( BOOL keepunowned ) +static void CDECL nulldrv_EmptyClipboard(void) { } @@ -684,9 +684,9 @@ static BOOL CDECL loaderdrv_CountClipboardFormats(void) return load_driver()->pCountClipboardFormats(); } -static void CDECL loaderdrv_EmptyClipboard( BOOL keepunowned ) +static void CDECL loaderdrv_EmptyClipboard(void) { - load_driver()->pEmptyClipboard( keepunowned ); + load_driver()->pEmptyClipboard(); } static void CDECL loaderdrv_EndClipboardUpdate(void) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 445fd40..01b9728 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -82,7 +82,7 @@ typedef struct tagUSER_DRIVER { /* clipboard functions */ INT (CDECL *pAcquireClipboard)(HWND); /* Acquire selection */ BOOL (CDECL *pCountClipboardFormats)(void); /* Count available clipboard formats */ - void (CDECL *pEmptyClipboard)(BOOL); /* Empty clipboard data */ + void (CDECL *pEmptyClipboard)(void); /* Empty clipboard data */ void (CDECL *pEndClipboardUpdate)(void); /* End clipboard update */ UINT (CDECL *pEnumClipboardFormats)(UINT); /* Enumerate clipboard formats */ HANDLE (CDECL *pGetClipboardData)(UINT); /* Get specified selection data */ diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index fe42023..3851d23 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1952,9 +1952,9 @@ INT CDECL macdrv_CountClipboardFormats(void) * * Empty cached clipboard data. */ -void CDECL macdrv_EmptyClipboard(BOOL keepunowned) +void CDECL macdrv_EmptyClipboard(void) { - TRACE("keepunowned %d\n", keepunowned); + TRACE("()\n"); macdrv_clear_pasteboard(); } diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 58a894b..a7dbb30 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -14,7 +14,7 @@ @ cdecl CreateWindow(long) macdrv_CreateWindow @ cdecl DestroyCursorIcon(long) macdrv_DestroyCursorIcon @ cdecl DestroyWindow(long) macdrv_DestroyWindow -@ cdecl EmptyClipboard(long) macdrv_EmptyClipboard +@ cdecl EmptyClipboard() macdrv_EmptyClipboard @ cdecl EndClipboardUpdate() macdrv_EndClipboardUpdate @ cdecl EnumClipboardFormats(long) macdrv_EnumClipboardFormats @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index a460e0a..073e7cb 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -129,7 +129,6 @@ static int selectionAcquired = 0; /* Contains the current selection static Window selectionWindow = None; /* The top level X window which owns the selection */ static Atom selectionCacheSrc = XA_PRIMARY; /* The selection source from which the clipboard cache was filled */ -void CDECL X11DRV_EmptyClipboard(BOOL keepunowned); void CDECL X11DRV_EndClipboardUpdate(void); static HANDLE X11DRV_CLIPBOARD_ImportClipboardData(Display *d, Window w, Atom prop); static HANDLE X11DRV_CLIPBOARD_ImportEnhMetaFile(Display *d, Window w, Atom prop); @@ -171,6 +170,7 @@ static BOOL X11DRV_CLIPBOARD_RenderSynthesizedDIB(Display *display); static BOOL X11DRV_CLIPBOARD_RenderSynthesizedBitmap(Display *display); static BOOL X11DRV_CLIPBOARD_RenderSynthesizedEnhMetaFile(Display *display); static void X11DRV_HandleSelectionRequest( HWND hWnd, XSelectionRequestEvent *event, BOOL bIsMultiple ); +static void empty_clipboard( BOOL keepunowned ); /* Clipboard formats */ @@ -621,7 +621,7 @@ static BOOL X11DRV_CLIPBOARD_UpdateCache(void) } else if (wSeqNo < seqno) { - X11DRV_EmptyClipboard(TRUE); + empty_clipboard( TRUE ); if (X11DRV_CLIPBOARD_QueryAvailableData(thread_init_display()) < 0) { @@ -2862,7 +2862,7 @@ static void X11DRV_CLIPBOARD_ReleaseSelection(Display *display, Atom selType, Wi selectionWindow = None; - X11DRV_EmptyClipboard(FALSE); + empty_clipboard( FALSE ); /* Reset the selection flags now that we are done */ selectionAcquired = S_NOSELECTION; @@ -2982,12 +2982,7 @@ int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) } -/************************************************************************** - * X11DRV_EmptyClipboard - * - * Empty cached clipboard data. - */ -void CDECL X11DRV_EmptyClipboard(BOOL keepunowned) +static void empty_clipboard(BOOL keepunowned) { WINE_CLIPDATA *data, *next; @@ -3003,7 +2998,15 @@ void CDECL X11DRV_EmptyClipboard(BOOL keepunowned) TRACE(" %d entries remaining in cache.\n", ClipDataCount); } - +/************************************************************************** + * X11DRV_EmptyClipboard + * + * Empty cached clipboard data. + */ +void CDECL X11DRV_EmptyClipboard(void) +{ + empty_clipboard( FALSE ); +} /************************************************************************** * X11DRV_SetClipboardData @@ -3154,7 +3157,7 @@ void X11DRV_ResetSelectionOwner(void) WARN("Failed to find another thread to take selection ownership. Clipboard data will be lost.\n"); X11DRV_CLIPBOARD_ReleaseOwnership(); - X11DRV_EmptyClipboard(FALSE); + empty_clipboard( FALSE ); } diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index b6e5c05..ce084b5 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -28,7 +28,7 @@ @ cdecl CreateDesktopWindow(long) X11DRV_CreateDesktopWindow @ cdecl CreateWindow(long) X11DRV_CreateWindow @ cdecl DestroyWindow(long) X11DRV_DestroyWindow -@ cdecl EmptyClipboard(long) X11DRV_EmptyClipboard +@ cdecl EmptyClipboard() X11DRV_EmptyClipboard @ cdecl EndClipboardUpdate() X11DRV_EndClipboardUpdate @ cdecl EnumClipboardFormats(long) X11DRV_EnumClipboardFormats @ cdecl GetClipboardData(long) X11DRV_GetClipboardData

1 0