March 2012 - Wine-commits - list.winehq.org

Michael Stefaniuc : activeds: Print the debug string and not the pointer to it.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 1660c39cadaf5585c47ceff9cd82d12b8db01529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1660c39cadaf5585c47ceff9c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:33:39 2012 +0100 activeds: Print the debug string and not the pointer to it. --- dlls/activeds/activeds_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 67066f0..c249cf1 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -116,7 +116,7 @@ HRESULT WINAPI ADsBuildVarArrayInt(LPDWORD lpdwObjectTypes, DWORD dwObjectTypes, */ HRESULT WINAPI ADsOpenObject(LPCWSTR lpszPathName, LPCWSTR lpszUserName, LPCWSTR lpszPassword, DWORD dwReserved, REFIID riid, VOID** ppObject) { - FIXME("(%s,%s,%u,%p,%p)!stub\n", debugstr_w(lpszPathName), + FIXME("(%s,%s,%u,%s,%p)!stub\n", debugstr_w(lpszPathName), debugstr_w(lpszUserName), dwReserved, debugstr_guid(riid), ppObject); return E_NOTIMPL; }

1 0

Michael Stefaniuc : comdlg32: Print the debug string and not the pointer to it.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: d63ae3658b817557ac56ff575094a668df38f95d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d63ae3658b817557ac56ff575… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:33:52 2012 +0100 comdlg32: Print the debug string and not the pointer to it. --- dlls/comdlg32/itemdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index f700891..3955a75 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -3527,7 +3527,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnSetControlItemText(IFileDialogCusto LPCWSTR pszLabel) { FileDialogImpl *This = impl_from_IFileDialogCustomize(iface); - FIXME("stub - %p (%d, %d, %p)\n", This, dwIDCtl, dwIDItem, debugstr_w(pszLabel)); + FIXME("stub - %p (%d, %d, %s)\n", This, dwIDCtl, dwIDItem, debugstr_w(pszLabel)); return E_NOTIMPL; }

1 0

Henri Verbeet : d3d8: Don' t return a pointer to the implementation in IDirect3DCubeTexture8Impl_QueryInterface ().
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 635ab65651484760f9b55fef3dc2049c76e4b14f URL: http://source.winehq.org/git/wine.git/?a=commit;h=635ab65651484760f9b55fef3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 25 20:56:30 2012 +0200 d3d8: Don't return a pointer to the implementation in IDirect3DCubeTexture8Impl_QueryInterface(). --- dlls/d3d8/cubetexture.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index f092f35..c28eeb6 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -31,20 +31,20 @@ static inline IDirect3DCubeTexture8Impl *impl_from_IDirect3DCubeTexture8(IDirect static HRESULT WINAPI IDirect3DCubeTexture8Impl_QueryInterface(IDirect3DCubeTexture8 *iface, REFIID riid, void **ppobj) { - IDirect3DCubeTexture8Impl *This = impl_from_IDirect3DCubeTexture8(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DResource8) - || IsEqualGUID(riid, &IID_IDirect3DBaseTexture8) - || IsEqualGUID(riid, &IID_IDirect3DCubeTexture8)) { + if (IsEqualGUID(riid, &IID_IDirect3DCubeTexture8) + || IsEqualGUID(riid, &IID_IDirect3DBaseTexture8) + || IsEqualGUID(riid, &IID_IDirect3DResource8) + || IsEqualGUID(riid, &IID_IUnknown)) + { IUnknown_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : ddraw: Make ddraw_surface_wined3d_parent_ops static.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 6f35ec6092055bda229af9a95642d6541dbdfd44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f35ec6092055bda229af9a95… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 25 20:56:31 2012 +0200 ddraw: Make ddraw_surface_wined3d_parent_ops static. --- dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/surface.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 2822585..700a781 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -37,7 +37,6 @@ #include "wine/list.h" #include "wine/wined3d.h" -extern const struct wined3d_parent_ops ddraw_surface_wined3d_parent_ops DECLSPEC_HIDDEN; extern const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops DECLSPEC_HIDDEN; /* Typdef the interfaces */ diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 8fc00e4..cca17ab 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5585,7 +5585,7 @@ static void STDMETHODCALLTYPE ddraw_surface_wined3d_object_destroyed(void *paren HeapFree(GetProcessHeap(), 0, surface); } -const struct wined3d_parent_ops ddraw_surface_wined3d_parent_ops = +static const struct wined3d_parent_ops ddraw_surface_wined3d_parent_ops = { ddraw_surface_wined3d_object_destroyed, };

1 0

Jacek Caban : jscript: Store source code in bytecode_t.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 0762106648a52883b21f07cb344b879d6a2b6e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0762106648a52883b21f07cb3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 26 11:41:38 2012 +0200 jscript: Store source code in bytecode_t. --- dlls/jscript/compile.c | 15 +++++++++++---- dlls/jscript/engine.h | 4 +++- dlls/jscript/parser.y | 9 +-------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index bb00aec..c9d814f 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1703,13 +1703,14 @@ void release_bytecode(bytecode_t *code) for(i=0; i < code->bstr_cnt; i++) SysFreeString(code->bstr_pool[i]); + heap_free(code->source); jsheap_free(&code->heap); heap_free(code->bstr_pool); heap_free(code->instrs); heap_free(code); } -static HRESULT init_code(compiler_ctx_t *compiler) +static HRESULT init_code(compiler_ctx_t *compiler, const WCHAR *source) { compiler->code = heap_alloc_zero(sizeof(bytecode_t)); if(!compiler->code) @@ -1718,6 +1719,12 @@ static HRESULT init_code(compiler_ctx_t *compiler) compiler->code->ref = 1; jsheap_init(&compiler->code->heap); + compiler->code->source = heap_strdupW(source); + if(!compiler->code->source) { + release_bytecode(compiler->code); + return E_OUTOFMEMORY; + } + compiler->code->instrs = heap_alloc(64 * sizeof(instr_t)); if(!compiler->code->instrs) { release_bytecode(compiler->code); @@ -1769,13 +1776,13 @@ HRESULT compile_script(script_ctx_t *ctx, const WCHAR *code, const WCHAR *delimi compiler_ctx_t compiler = {0}; HRESULT hres; - hres = script_parse(ctx, code, delimiter, from_eval, &compiler.parser); + hres = init_code(&compiler, code); if(FAILED(hres)) return hres; - hres = init_code(&compiler); + hres = script_parse(ctx, compiler.code->source, delimiter, from_eval, &compiler.parser); if(FAILED(hres)) { - parser_release(compiler.parser); + release_bytecode(compiler.code); return hres; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 040b3c4..64c0fea 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -43,7 +43,7 @@ typedef struct _func_stack { } func_stack_t; typedef struct { - WCHAR *begin; + const WCHAR *begin; const WCHAR *end; const WCHAR *ptr; @@ -172,6 +172,8 @@ typedef struct _bytecode_t { instr_t *instrs; jsheap_t heap; + WCHAR *source; + BSTR *bstr_pool; unsigned bstr_pool_size; unsigned bstr_cnt; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 717a95c..4eb3f1d 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1533,7 +1533,6 @@ static void program_parsed(parser_ctx_t *ctx, source_elements_t *source) void parser_release(parser_ctx_t *ctx) { script_release(ctx->script); - heap_free(ctx->begin); jsheap_free(&ctx->heap); heap_free(ctx); } @@ -1554,13 +1553,7 @@ HRESULT script_parse(script_ctx_t *ctx, const WCHAR *code, const WCHAR *delimite parser_ctx->hres = JS_E_SYNTAX; parser_ctx->is_html = delimiter && !strcmpiW(delimiter, html_tagW); - parser_ctx->begin = heap_strdupW(code); - if(!parser_ctx->begin) { - heap_free(parser_ctx); - return E_OUTOFMEMORY; - } - - parser_ctx->ptr = parser_ctx->begin; + parser_ctx->begin = parser_ctx->ptr = code; parser_ctx->end = parser_ctx->begin + strlenW(parser_ctx->begin); script_addref(ctx);

1 0

Jacek Caban : jscript: Added beginning support for JScriptEncode object.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 4a9eea3516f750f5f99790d3b9cec160974fa847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a9eea3516f750f5f99790d3b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 26 11:41:56 2012 +0200 jscript: Added beginning support for JScriptEncode object. --- dlls/jscript/jscript.c | 16 +++++----------- dlls/jscript/jscript.h | 2 +- dlls/jscript/jscript_main.c | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 5bd5db4..4674ffc 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -55,6 +55,7 @@ typedef struct { LONG thread_id; LCID lcid; DWORD version; + BOOL is_encode; IActiveScriptSite *site; @@ -1029,25 +1030,17 @@ static const IVariantChangeTypeVtbl VariantChangeTypeVtbl = { VariantChangeType_ChangeType }; -HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, - REFIID riid, void **ppv) +HRESULT create_jscript_object(BOOL is_encode, REFIID riid, void **ppv) { JScript *ret; HRESULT hres; - TRACE("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppv); - - if(pUnkOuter) { - *ppv = NULL; - return CLASS_E_NOAGGREGATION; - } - - lock_module(); - ret = heap_alloc_zero(sizeof(*ret)); if(!ret) return E_OUTOFMEMORY; + lock_module(); + ret->IActiveScript_iface.lpVtbl = &JScriptVtbl; ret->IActiveScriptParse_iface.lpVtbl = &JScriptParseVtbl; ret->IActiveScriptParseProcedure2_iface.lpVtbl = &JScriptParseProcedureVtbl; @@ -1056,6 +1049,7 @@ HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUn ret->IVariantChangeType_iface.lpVtbl = &VariantChangeTypeVtbl; ret->ref = 1; ret->safeopt = INTERFACE_USES_DISPEX; + ret->is_encode = is_encode; hres = IActiveScript_QueryInterface(&ret->IActiveScript_iface, riid, ppv); IActiveScript_Release(&ret->IActiveScript_iface); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 41085f1..a64de90 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -505,7 +505,7 @@ static inline BOOL is_jscript_error(HRESULT hres) const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN; -HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; +HRESULT create_jscript_object(BOOL,REFIID,void**) DECLSPEC_HIDDEN; extern LONG module_ref DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jscript_main.c b/dlls/jscript/jscript_main.c index b97e258..c7419fc 100644 --- a/dlls/jscript/jscript_main.c +++ b/dlls/jscript/jscript_main.c @@ -83,6 +83,19 @@ static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) return S_OK; } +static HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, + REFIID riid, void **ppv) +{ + TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + + if(outer) { + *ppv = NULL; + return CLASS_E_NOAGGREGATION; + } + + return create_jscript_object(FALSE, riid, ppv); +} + static const IClassFactoryVtbl JScriptFactoryVtbl = { ClassFactory_QueryInterface, ClassFactory_AddRef, @@ -93,6 +106,29 @@ static const IClassFactoryVtbl JScriptFactoryVtbl = { static IClassFactory JScriptFactory = { &JScriptFactoryVtbl }; +static HRESULT WINAPI JScriptEncodeFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, + REFIID riid, void **ppv) +{ + TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + + if(outer) { + *ppv = NULL; + return CLASS_E_NOAGGREGATION; + } + + return create_jscript_object(TRUE, riid, ppv); +} + +static const IClassFactoryVtbl JScriptEncodeFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + JScriptEncodeFactory_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory JScriptEncodeFactory = { &JScriptEncodeFactoryVtbl }; + /****************************************************************** * DllMain (jscript.@) */ @@ -123,6 +159,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return IClassFactory_QueryInterface(&JScriptFactory, riid, ppv); } + if(IsEqualGUID(&CLSID_JScriptEncode, rclsid)) { + TRACE("(CLSID_JScriptEncode %s %p)\n", debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&JScriptEncodeFactory, riid, ppv); + } + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; }

1 0

Jacek Caban : jscript: Added JScriptEncode object tests.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 129183ebb034dd65e2b1a94a516ceea8d0199df8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=129183ebb034dd65e2b1a94a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 26 11:42:13 2012 +0200 jscript: Added JScriptEncode object tests. --- dlls/jscript/tests/jscript.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index c453971..0ffb2a5 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -31,6 +31,8 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static const CLSID CLSID_JScript = {0xf414c260,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}}; +static const CLSID CLSID_JScriptEncode = + {0xf414c262,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}}; #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -66,6 +68,8 @@ DEFINE_EXPECT(OnStateChange_INITIALIZED); DEFINE_EXPECT(OnEnterScript); DEFINE_EXPECT(OnLeaveScript); +static const CLSID *engine_clsid = &CLSID_JScript; + static BSTR a2bstr(const char *str) { BSTR ret; @@ -409,7 +413,7 @@ static IActiveScript *create_jscript(void) IActiveScript *ret; HRESULT hres; - hres = CoCreateInstance(&CLSID_JScript, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + hres = CoCreateInstance(engine_clsid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IActiveScript, (void**)&ret); ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); @@ -662,10 +666,15 @@ START_TEST(jscript) CoInitialize(NULL); if(check_jscript()) { + trace("Testing JScript object...\n"); test_jscript(); test_jscript2(); test_jscript_uninitializing(); test_aggregation(); + + trace("Testing JScriptEncode object...\n"); + engine_clsid = &CLSID_JScriptEncode; + test_jscript(); }else { win_skip("Broken engine, probably too old\n"); }

1 0

Jacek Caban : jscript: Added decoding support.
by Alexandre Julliard 26 Mar '12

26 Mar '12

1 0

Jacek Caban : jscript: Added decoding tests.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: c18b84cf4e9ee3127d354de06650b4bb04be54d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c18b84cf4e9ee3127d354de06… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 26 11:43:23 2012 +0200 jscript: Added decoding tests. --- dlls/jscript/tests/run.c | 83 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 79 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 64a8c7e..dbf83e6 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -29,6 +29,8 @@ static const CLSID CLSID_JScript = {0xf414c260,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}}; +static const CLSID CLSID_JScriptEncode = + {0xf414c262,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}}; #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -97,6 +99,8 @@ DEFINE_EXPECT(DeleteMemberByDispID); #define DISPID_TESTOBJ_PROP 0x2000 #define DISPID_TESTOBJ_ONLYDISPID 0x2001 +#define JS_E_INVALID_CHAR 0x800a03f6 + static const WCHAR testW[] = {'t','e','s','t',0}; static const CHAR testA[] = "test"; static const WCHAR test_valW[] = {'t','e','s','t','V','a','l',0}; @@ -107,6 +111,7 @@ static const char *test_name = "(null)"; static IDispatch *script_disp; static int invoke_version; static IActiveScriptError *script_error; +static const CLSID *engine_clsid = &CLSID_JScript; /* Returns true if the user interface is in English. Note that this does not * presume of the formatting of dates, numbers, etc. @@ -1016,7 +1021,7 @@ static IActiveScript *create_script(void) VARIANT v; HRESULT hres; - hres = CoCreateInstance(&CLSID_JScript, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + hres = CoCreateInstance(engine_clsid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IActiveScript, (void**)&script); ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); @@ -1440,7 +1445,7 @@ static void test_isvisible(BOOL global_members) IUnknown_Release(parser); } -static void run_tests(void) +static BOOL run_tests(void) { HRESULT hres; @@ -1450,7 +1455,7 @@ static void run_tests(void) script = create_script(); if(!script) { win_skip("Could not create script\n"); - return; + return FALSE; } IActiveScript_Release(script); } @@ -1648,6 +1653,73 @@ static void run_tests(void) "Microsoft JScript runtime error", "Object expected", NULL); + + return TRUE; +} + +static void run_encoded_tests(void) +{ + BSTR src; + HRESULT hres; + + engine_clsid = &CLSID_JScriptEncode; + + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + /* |reportSuccess(); | */ + parse_script_a("#@~^EAAAAA==.\x7fwGMYUEm1+kd`*iAQYAAA==^#~@"); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + parse_script_a("reportSuccess();"); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + /* |Success | */ + parse_script_a("report#@~^BwAAAA==j!m^\x7f/k2QIAAA==^#~@();"); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + /* |\r\n\treportSuccess();\r\n | */ + parse_script_a("#@~^GQAAAA==@#@&d.\x7fwKDYUE1^+k/c#p@#@&OAYAAA==^#~@"); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + + /* v */ + src = a2bstr("#@~^EAA*AA==.\x7fwGMYUEm1+kd`*iAQYAAA==^#~@"); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, src); + SysFreeString(src); + ok(hres == JS_E_INVALID_CHAR, "parse_script failed %08x\n", hres); + + /* vv */ + src = a2bstr("#@~^EAAAAAAA==.\x7fwGMYUEm1+kd`*iAQYAAA==^#~@"); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, src); + SysFreeString(src); + ok(hres == JS_E_INVALID_CHAR, "parse_script failed %08x\n", hres); + + /* v */ + src = a2bstr("#@~^EAAAAA^=.\x7fwGMYUEm1+kd`*iAQYAAA==^#~@"); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, src); + SysFreeString(src); + ok(hres == JS_E_INVALID_CHAR, "parse_script failed %08x\n", hres); + + /* v */ + src = a2bstr("#@~^EAAAAA==.\x7fwGMYUEm1ekd`*iAQYAAA==^#~@"); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, src); + SysFreeString(src); + ok(hres == JS_E_INVALID_CHAR, "parse_script failed %08x\n", hres); + + /* vv */ + src = a2bstr("#@~^EAAAAA==.\x7fwGMYUEm1+kd`*iAQYAAA==^~#@"); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, src); + SysFreeString(src); + ok(hres == JS_E_INVALID_CHAR, "parse_script failed %08x\n", hres); } static BOOL check_jscript(void) @@ -1690,7 +1762,10 @@ START_TEST(run) trace("invoke version 2\n"); invoke_version = 2; - run_tests(); + if(run_tests()) { + trace("JSctipt.Encode tests...\n"); + run_encoded_tests(); + } } CoUninitialize();

1 0

Jacek Caban : vbscript: Lookup visible items before global members in lookup_identifier.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: e4bfd4e0574c435f20501d3a0f98f4239fbf547a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4bfd4e0574c435f20501d3a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 26 11:52:33 2012 +0200 vbscript: Lookup visible items before global members in lookup_identifier. --- dlls/vbscript/interp.c | 22 ++++++++++++---------- dlls/vbscript/tests/run.c | 6 ++++++ 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4be1d43..df30e0e 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -164,16 +164,6 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } LIST_FOR_EACH_ENTRY(item, &ctx->script->named_items, named_item_t, entry) { - if((item->flags & SCRIPTITEM_GLOBALMEMBERS)) { - hres = disp_get_id(item->disp, name, invoke_type, FALSE, &id); - if(SUCCEEDED(hres)) { - ref->type = REF_DISP; - ref->u.d.disp = item->disp; - ref->u.d.id = id; - return S_OK; - } - } - if((item->flags & SCRIPTITEM_ISVISIBLE) && !strcmpiW(item->name, name)) { if(!item->disp) { IUnknown *unk; @@ -198,6 +188,18 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } + LIST_FOR_EACH_ENTRY(item, &ctx->script->named_items, named_item_t, entry) { + if((item->flags & SCRIPTITEM_GLOBALMEMBERS)) { + hres = disp_get_id(item->disp, name, invoke_type, FALSE, &id); + if(SUCCEEDED(hres)) { + ref->type = REF_DISP; + ref->u.d.disp = item->disp; + ref->u.d.id = id; + return S_OK; + } + } + } + ref->type = REF_NONE; return S_OK; } diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 43c9be4..3fb506b 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1197,6 +1197,12 @@ static void run_tests(void) CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + parse_script_a("test.reportSuccess()"); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + SET_EXPECT(global_vbvar_d); SET_EXPECT(global_vbvar_i); parse_script_a("Option Explicit\nvbvar = 3");

1 0