November 2011 - Wine-commits

Jacek Caban : jscript: Use bytecode for binary negation implementation.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: 2d83bdcfbe74253b5b00583e3be9cb0fde5ca40e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d83bdcfbe74253b5b00583e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 21 15:35:15 2011 +0100 jscript: Use bytecode for binary negation implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 26 ++++++++------------------ dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- dlls/jscript/tests/lang.js | 5 +++++ 5 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index b51f68f..8431b5c 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -107,6 +107,8 @@ static HRESULT compile_interp_fallback(compiler_ctx_t *ctx, expression_t *expr) static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) { switch(expr->type) { + case EXPR_BITNEG: + return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_bneg); case EXPR_EQEQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eq2); case EXPR_LOGNEG: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 29fb64b..17d8fa6 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3020,33 +3020,23 @@ HRESULT greatereq_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD } /* ECMA-262 3rd Edition 11.4.8 */ -HRESULT binary_negation_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +HRESULT interp_bneg(exec_ctx_t *ctx) { - unary_expression_t *expr = (unary_expression_t*)_expr; - exprval_t exprval; - VARIANT val; + VARIANT *v, r; INT i; HRESULT hres; TRACE("\n"); - hres = expr_eval(ctx, expr->expression, EXPR_NEWREF, ei, &exprval); - if(FAILED(hres)) - return hres; - - hres = exprval_to_value(ctx, &exprval, ei, &val); - exprval_release(&exprval); - if(FAILED(hres)) - return hres; - - hres = to_int32(ctx, &val, ei, &i); + v = stack_pop(ctx); + hres = to_int32(ctx->parser->script, v, &ctx->ei, &i); + VariantClear(v); if(FAILED(hres)) return hres; - ret->type = EXPRVAL_VARIANT; - V_VT(&ret->u.var) = VT_I4; - V_I4(&ret->u.var) = ~i; - return S_OK; + V_VT(&r) = VT_I4; + V_I4(&r) = ~i; + return stack_push(ctx, &r); } /* ECMA-262 3rd Edition 11.4.9 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 55c29e8..8692b0a 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -42,6 +42,7 @@ typedef struct _func_stack { } func_stack_t; #define OP_LIST \ + X(bneg, 1, 0) \ X(eq2, 1, 0) \ X(neg, 1, 0) \ X(neq2, 1, 0) \ @@ -547,7 +548,6 @@ HRESULT less_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprv HRESULT lesseq_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT greater_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT greatereq_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT binary_negation_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT left_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT right_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT right2_shift_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 fd294bd..d580ec0 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1335,7 +1335,7 @@ static const expression_eval_t expression_eval_table[] = { lesseq_expression_eval, greater_expression_eval, greatereq_expression_eval, - binary_negation_expression_eval, + compiled_expression_eval, compiled_expression_eval, left_shift_expression_eval, right_shift_expression_eval, diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 92eb642..7cd20dd 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -210,6 +210,11 @@ for(var iter in pureDisp) tmp = new Object(); ok(!tmp.nonexistent, "!tmp.nonexistent = " + !tmp.nonexistent); +ok(!("nonexistent" in tmp), "nonexistent is in tmp after '!' expression") + +tmp = new Object(); +ok((~tmp.nonexistent) === -1, "!tmp.nonexistent = " + ~tmp.nonexistent); +ok(!("nonexistent" in tmp), "nonexistent is in tmp after '~' expression") tmp = 0; if(true)

1 0

Jacek Caban : jscript: Use bytecode for unary '+' expression.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: 35b9c42f530a9a338eaae928c96bd12c7a3514aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=35b9c42f530a9a338eaae928c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 21 15:35:41 2011 +0100 jscript: Use bytecode for unary '+' expression. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 24 ++++++------------------ dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 8431b5c..1bc887c 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -115,6 +115,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_neg); case EXPR_NOTEQEQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_neq2); + case EXPR_PLUS: + return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_tonum); default: assert(expr->eval != compiled_expression_eval); return compile_interp_fallback(ctx, expr); diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 17d8fa6..1f5863a 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2532,32 +2532,20 @@ HRESULT minus_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flag } /* ECMA-262 3rd Edition 11.4.6 */ -HRESULT plus_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +HRESULT interp_tonum(exec_ctx_t *ctx) { - unary_expression_t *expr = (unary_expression_t*)_expr; - exprval_t exprval; - VARIANT val, num; + VARIANT *v, num; HRESULT hres; TRACE("\n"); - hres = expr_eval(ctx, expr->expression, EXPR_NEWREF, ei, &exprval); - if(FAILED(hres)) - return hres; - - hres = exprval_to_value(ctx, &exprval, ei, &val); - exprval_release(&exprval); - if(FAILED(hres)) - return hres; - - hres = to_number(ctx, &val, ei, &num); - VariantClear(&val); + v = stack_pop(ctx); + hres = to_number(ctx->parser->script, v, &ctx->ei, &num); + VariantClear(v); if(FAILED(hres)) return hres; - ret->type = EXPRVAL_VARIANT; - ret->u.var = num; - return S_OK; + return stack_push(ctx, &num); } /* ECMA-262 3rd Edition 11.3.1 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 8692b0a..c004af3 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -46,6 +46,7 @@ typedef struct _func_stack { X(eq2, 1, 0) \ X(neg, 1, 0) \ X(neq2, 1, 0) \ + X(tonum, 1, 0) \ X(tree, 1, ARG_EXPR) \ X(ret, 0, 0) @@ -537,7 +538,6 @@ HRESULT delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exp HRESULT void_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; HRESULT minus_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT plus_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT post_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT post_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT pre_increment_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 d580ec0..92c79fc 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1322,7 +1322,7 @@ static const expression_eval_t expression_eval_table[] = { void_expression_eval, typeof_expression_eval, minus_expression_eval, - plus_expression_eval, + compiled_expression_eval, post_increment_expression_eval, post_decrement_expression_eval, pre_increment_expression_eval,

1 0

Alexandre Julliard : winecfg: Remove some untranslatable labels.
by Alexandre Julliard 21 Nov '11

21 Nov '11

1 0

Hans Leidekker : winhttp: Reverse the order of arguments passed to Invoke.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: 654b0eeaeacbc2264cb4c2077c21de4f77ba03db URL: http://source.winehq.org/git/wine.git/?a=commit;h=654b0eeaeacbc2264cb4c2077… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 21 12:32:50 2011 +0100 winhttp: Reverse the order of arguments passed to Invoke. --- dlls/winhttp/session.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index f0d9974..a55fa21 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1661,9 +1661,9 @@ static BOOL run_script( const BSTR script, const WCHAR *url, WINHTTP_PROXY_INFO if (hr != S_OK) goto done; V_VT( &args[0] ) = VT_BSTR; - V_BSTR( &args[0] ) = SysAllocString( url ); + V_BSTR( &args[0] ) = hostname; V_VT( &args[1] ) = VT_BSTR; - V_BSTR( &args[1] ) = hostname; + V_BSTR( &args[1] ) = SysAllocString( url ); params.rgvarg = args; params.rgdispidNamedArgs = NULL;

1 0

Hans Leidekker : winhttp: Fix a memory leak in run_script.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: b81b3d1af508f01a77ea91b7710b88cd6841e42e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b81b3d1af508f01a77ea91b77… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 21 12:33:19 2011 +0100 winhttp: Fix a memory leak in run_script. --- dlls/winhttp/session.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index a55fa21..765d5c7 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1671,13 +1671,13 @@ static BOOL run_script( const BSTR script, const WCHAR *url, WINHTTP_PROXY_INFO params.cNamedArgs = 0; hr = IDispatch_Invoke( dispatch, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD, &params, &result, NULL, NULL ); - VariantClear( &args[0] ); VariantClear( &args[1] ); if (hr != S_OK) goto done; ret = parse_script_result( result, info ); done: + SysFreeString( hostname ); SysFreeString( func ); if (dispatch) IDispatch_Release( dispatch ); if (parser) IUnknown_Release( parser );

1 0

Hans Leidekker : winhttp: Make the standard utilities available to PAC scripts.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: 9990f6c4a5c50443707e88fed5829700fab619a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9990f6c4a5c50443707e88fed… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 21 12:33:51 2011 +0100 winhttp: Make the standard utilities available to PAC scripts. --- dlls/winhttp/Makefile.in | 2 +- dlls/winhttp/pac.js | 244 ++++++++++++++++++++++++++++++++++ dlls/winhttp/{version.rc => rsrc.rc} | 3 + dlls/winhttp/session.c | 237 +++++++++++++++++++++++++++++++-- 4 files changed, 473 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9990f6c4a5c50443707e8…

1 0

Frédéric Delanoy : cmd: Move builtins list to builtins.c.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: de7841b2ce3c37b6f221a781e37f71c4635a1e88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de7841b2ce3c37b6f221a781e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Nov 21 09:08:03 2011 +0100 cmd: Move builtins list to builtins.c. --- programs/cmd/builtins.c | 60 +++++++++++++++++++++++++++++++++++++++++++--- programs/cmd/wcmd.h | 3 -- programs/cmd/wcmdmain.c | 54 +----------------------------------------- 3 files changed, 57 insertions(+), 60 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index bb64b66..56961a3 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -41,19 +41,71 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); -static struct env_stack *saved_environment; -struct env_stack *pushd_directories; - extern HINSTANCE hinst; -extern WCHAR inbuilt[][10]; extern int defaultColor; extern BOOL echo_mode; extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; extern BATCH_CONTEXT *context; extern DWORD errorlevel; +static struct env_stack *saved_environment; +struct env_stack *pushd_directories; + static BOOL verify_mode = FALSE; +const WCHAR inbuilt[][10] = { + {'C','A','L','L','\0'}, + {'C','D','\0'}, + {'C','H','D','I','R','\0'}, + {'C','L','S','\0'}, + {'C','O','P','Y','\0'}, + {'C','T','T','Y','\0'}, + {'D','A','T','E','\0'}, + {'D','E','L','\0'}, + {'D','I','R','\0'}, + {'E','C','H','O','\0'}, + {'E','R','A','S','E','\0'}, + {'F','O','R','\0'}, + {'G','O','T','O','\0'}, + {'H','E','L','P','\0'}, + {'I','F','\0'}, + {'L','A','B','E','L','\0'}, + {'M','D','\0'}, + {'M','K','D','I','R','\0'}, + {'M','O','V','E','\0'}, + {'P','A','T','H','\0'}, + {'P','A','U','S','E','\0'}, + {'P','R','O','M','P','T','\0'}, + {'R','E','M','\0'}, + {'R','E','N','\0'}, + {'R','E','N','A','M','E','\0'}, + {'R','D','\0'}, + {'R','M','D','I','R','\0'}, + {'S','E','T','\0'}, + {'S','H','I','F','T','\0'}, + {'T','I','M','E','\0'}, + {'T','I','T','L','E','\0'}, + {'T','Y','P','E','\0'}, + {'V','E','R','I','F','Y','\0'}, + {'V','E','R','\0'}, + {'V','O','L','\0'}, + {'E','N','D','L','O','C','A','L','\0'}, + {'S','E','T','L','O','C','A','L','\0'}, + {'P','U','S','H','D','\0'}, + {'P','O','P','D','\0'}, + {'A','S','S','O','C','\0'}, + {'C','O','L','O','R','\0'}, + {'F','T','Y','P','E','\0'}, + {'M','O','R','E','\0'}, + {'C','H','O','I','C','E','\0'}, + {'E','X','I','T','\0'} +}; + +static const WCHAR externals[][10] = { + {'A','T','T','R','I','B','\0'}, + {'X','C','O','P','Y','\0'} +}; + const WCHAR dotW[] = {'.','\0'}; const WCHAR dotdotW[] = {'.','.','\0'}; const WCHAR nullW[] = {'\0'}; diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 88b28c1..c45bc88 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -215,9 +215,6 @@ typedef struct _DIRECTORY_STACK /* Must be last in list */ #define WCMD_EXIT 44 -#define NUM_EXTERNALS 2 -extern const WCHAR externals[NUM_EXTERNALS][10]; - /* Some standard messages */ extern const WCHAR newline[]; extern const WCHAR space[]; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index e306d52..090a6f1 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -31,59 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); -const WCHAR inbuilt[][10] = { - {'C','A','L','L','\0'}, - {'C','D','\0'}, - {'C','H','D','I','R','\0'}, - {'C','L','S','\0'}, - {'C','O','P','Y','\0'}, - {'C','T','T','Y','\0'}, - {'D','A','T','E','\0'}, - {'D','E','L','\0'}, - {'D','I','R','\0'}, - {'E','C','H','O','\0'}, - {'E','R','A','S','E','\0'}, - {'F','O','R','\0'}, - {'G','O','T','O','\0'}, - {'H','E','L','P','\0'}, - {'I','F','\0'}, - {'L','A','B','E','L','\0'}, - {'M','D','\0'}, - {'M','K','D','I','R','\0'}, - {'M','O','V','E','\0'}, - {'P','A','T','H','\0'}, - {'P','A','U','S','E','\0'}, - {'P','R','O','M','P','T','\0'}, - {'R','E','M','\0'}, - {'R','E','N','\0'}, - {'R','E','N','A','M','E','\0'}, - {'R','D','\0'}, - {'R','M','D','I','R','\0'}, - {'S','E','T','\0'}, - {'S','H','I','F','T','\0'}, - {'T','I','M','E','\0'}, - {'T','I','T','L','E','\0'}, - {'T','Y','P','E','\0'}, - {'V','E','R','I','F','Y','\0'}, - {'V','E','R','\0'}, - {'V','O','L','\0'}, - {'E','N','D','L','O','C','A','L','\0'}, - {'S','E','T','L','O','C','A','L','\0'}, - {'P','U','S','H','D','\0'}, - {'P','O','P','D','\0'}, - {'A','S','S','O','C','\0'}, - {'C','O','L','O','R','\0'}, - {'F','T','Y','P','E','\0'}, - {'M','O','R','E','\0'}, - {'C','H','O','I','C','E','\0'}, - {'E','X','I','T','\0'} -}; - -const WCHAR externals[NUM_EXTERNALS][10] = { - {'A','T','T','R','I','B','\0'}, - {'X','C','O','P','Y','\0'} -}; - +extern WCHAR inbuilt[][10]; HINSTANCE hinst; DWORD errorlevel; int defaultColor = 7;

1 0

Nikolay Sivov : msxml3: Added IDispatchEx support for SAXReader.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: 0ba0f4ccf851844c3348e84f00142732d5a6ff52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ba0f4ccf851844c3348e84f0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 21 12:23:25 2011 +0300 msxml3: Added IDispatchEx support for SAXReader. --- dlls/msxml3/saxreader.c | 71 ++++++++++++++------------------------ dlls/msxml3/tests/saxreader.c | 77 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 45 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index cda55c4..58918143 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -77,6 +77,7 @@ struct bstrpool typedef struct _saxreader { + DispatchEx dispex; IVBSAXXMLReader IVBSAXXMLReader_iface; ISAXXMLReader ISAXXMLReader_iface; LONG ref; @@ -2605,6 +2606,10 @@ static HRESULT WINAPI saxxmlreader_QueryInterface(IVBSAXXMLReader* iface, REFIID { *ppvObject = &This->ISAXXMLReader_iface; } + else if (dispex_query_interface(&This->dispex, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); @@ -2660,6 +2665,7 @@ static ULONG WINAPI saxxmlreader_Release( free_bstr_pool(&This->pool); + release_dispex(&This->dispex); heap_free( This ); } @@ -2669,12 +2675,7 @@ static ULONG WINAPI saxxmlreader_Release( static HRESULT WINAPI saxxmlreader_GetTypeInfoCount( IVBSAXXMLReader *iface, UINT* pctinfo ) { saxreader *This = impl_from_IVBSAXXMLReader( iface ); - - TRACE("(%p)->(%p)\n", This, pctinfo); - - *pctinfo = 1; - - return S_OK; + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI saxxmlreader_GetTypeInfo( @@ -2682,13 +2683,8 @@ static HRESULT WINAPI saxxmlreader_GetTypeInfo( UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo ) { saxreader *This = impl_from_IVBSAXXMLReader( iface ); - HRESULT hr; - - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - - hr = get_typeinfo(IVBSAXXMLReader_tid, ppTInfo); - - return hr; + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, + iTInfo, lcid, ppTInfo); } static HRESULT WINAPI saxxmlreader_GetIDsOfNames( @@ -2700,23 +2696,8 @@ static HRESULT WINAPI saxxmlreader_GetIDsOfNames( DISPID* rgDispId) { saxreader *This = impl_from_IVBSAXXMLReader( iface ); - ITypeInfo *typeinfo; - HRESULT hr; - - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - - if(!rgszNames || cNames == 0 || !rgDispId) - return E_INVALIDARG; - - hr = get_typeinfo(IVBSAXXMLReader_tid, &typeinfo); - if(SUCCEEDED(hr)) - { - hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); - ITypeInfo_Release(typeinfo); - } - - return hr; + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, + riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI saxxmlreader_Invoke( @@ -2731,21 +2712,8 @@ static HRESULT WINAPI saxxmlreader_Invoke( UINT* puArgErr) { saxreader *This = impl_from_IVBSAXXMLReader( iface ); - ITypeInfo *typeinfo; - HRESULT hr; - - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - - hr = get_typeinfo(IVBSAXXMLReader_tid, &typeinfo); - if(SUCCEEDED(hr)) - { - hr = ITypeInfo_Invoke(typeinfo, &This->IVBSAXXMLReader_iface, dispIdMember, wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); - ITypeInfo_Release(typeinfo); - } - - return hr; + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, + dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } /*** IVBSAXXMLReader methods ***/ @@ -3159,6 +3127,17 @@ static const struct ISAXXMLReaderVtbl isaxreader_vtbl = isaxxmlreader_parseURL }; +static const tid_t saxreader_iface_tids[] = { + IVBSAXXMLReader_tid, + 0 +}; +static dispex_static_data_t saxreader_dispex = { + NULL, + IVBSAXXMLReader_tid, + NULL, + saxreader_iface_tids +}; + HRESULT SAXXMLReader_create(MSXML_VERSION version, IUnknown *pUnkOuter, LPVOID *ppObj) { saxreader *reader; @@ -3187,6 +3166,8 @@ HRESULT SAXXMLReader_create(MSXML_VERSION version, IUnknown *pUnkOuter, LPVOID * reader->features = Namespaces; reader->version = version; + init_dispex(&reader->dispex, (IUnknown*)&reader->IVBSAXXMLReader_iface, &saxreader_dispex); + memset(&reader->sax, 0, sizeof(xmlSAXHandler)); reader->sax.initialized = XML_SAX2_MAGIC; reader->sax.startDocument = libxmlStartDocument; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 2ec20bf..fbb1bd2 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -28,7 +28,9 @@ #include "windows.h" #include "ole2.h" #include "msxml2.h" +#include "msxml2did.h" #include "ocidl.h" +#include "dispex.h" #include "wine/test.h" @@ -2596,6 +2598,80 @@ static void test_mxwriter_encoding(void) free_bstrs(); } +static void test_obj_dispex(IUnknown *obj) +{ + static const WCHAR starW[] = {'*',0}; + DISPID dispid = DISPID_SAX_XMLREADER_GETFEATURE; + IDispatchEx *dispex; + IUnknown *unk; + DWORD props; + UINT ticnt; + HRESULT hr; + BSTR name; + + hr = IUnknown_QueryInterface(obj, &IID_IDispatchEx, (void**)&dispex); + EXPECT_HR(hr, S_OK); + if (FAILED(hr)) return; + + ticnt = 0; + hr = IDispatchEx_GetTypeInfoCount(dispex, &ticnt); + EXPECT_HR(hr, S_OK); + ok(ticnt == 1, "ticnt=%u\n", ticnt); + + name = SysAllocString(starW); + hr = IDispatchEx_DeleteMemberByName(dispex, name, fdexNameCaseSensitive); + EXPECT_HR(hr, E_NOTIMPL); + SysFreeString(name); + + hr = IDispatchEx_DeleteMemberByDispID(dispex, dispid); + EXPECT_HR(hr, E_NOTIMPL); + + props = 0; + hr = IDispatchEx_GetMemberProperties(dispex, dispid, grfdexPropCanAll, &props); + EXPECT_HR(hr, E_NOTIMPL); + ok(props == 0, "expected 0 got %d\n", props); + + hr = IDispatchEx_GetMemberName(dispex, dispid, &name); + EXPECT_HR(hr, E_NOTIMPL); + if (SUCCEEDED(hr)) SysFreeString(name); + + hr = IDispatchEx_GetNextDispID(dispex, fdexEnumDefault, DISPID_SAX_XMLREADER_GETFEATURE, &dispid); + EXPECT_HR(hr, E_NOTIMPL); + + hr = IDispatchEx_GetNameSpaceParent(dispex, &unk); + EXPECT_HR(hr, E_NOTIMPL); + if (hr == S_OK && unk) IUnknown_Release(unk); + + IDispatchEx_Release(dispex); +} + +static void test_dispex(void) +{ + IVBSAXXMLReader *vbreader; + ISAXXMLReader *reader; + IUnknown *unk; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_SAXXMLReader, NULL, CLSCTX_INPROC_SERVER, + &IID_ISAXXMLReader, (void**)&reader); + EXPECT_HR(hr, S_OK); + + hr = ISAXXMLReader_QueryInterface(reader, &IID_IUnknown, (void**)&unk); + EXPECT_HR(hr, S_OK); + test_obj_dispex(unk); + IUnknown_Release(unk); + + hr = ISAXXMLReader_QueryInterface(reader, &IID_IVBSAXXMLReader, (void**)&vbreader); + EXPECT_HR(hr, S_OK); + hr = IVBSAXXMLReader_QueryInterface(vbreader, &IID_IUnknown, (void**)&unk); + EXPECT_HR(hr, S_OK); + test_obj_dispex(unk); + IUnknown_Release(unk); + IVBSAXXMLReader_Release(vbreader); + + ISAXXMLReader_Release(reader); +} + START_TEST(saxreader) { ISAXXMLReader *reader; @@ -2621,6 +2697,7 @@ START_TEST(saxreader) test_saxreader_properties(); test_saxreader_features(); test_encoding(); + test_dispex(); /* MXXMLWriter tests */ get_supported_mxwriter_data(msxmlsupported_data);

1 0

Bruno Jesus : regedit: Allow binary files to be imported.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: 8ad904c398e0303935120ec42a50104052ec9e76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ad904c398e0303935120ec42… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Nov 19 22:06:51 2011 -0200 regedit: Allow binary files to be imported. --- programs/regedit/regedit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index cc0fc3a..fe08501 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -159,7 +159,7 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, LPSTR s) getAppName(), filename, GetLastError()); exit(1); } - reg_file = fopen(realname, "r"); + reg_file = fopen(realname, "rb"); if (reg_file == NULL) { perror("");

1 0

Francois Gouget : inetcpl: Remove a couple of unused and untranslatable listview and trackbar labels.
by Alexandre Julliard 21 Nov '11

21 Nov '11

1 0