October 2009 - Wine-commits

Juan Lang : rsaenh: Make the enhanced crypto provider the default.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 7a6381e852a4daf0bbc77ffcb9da3bd85002e1d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a6381e852a4daf0bbc77ffcb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 19 13:39:50 2009 -0700 rsaenh: Make the enhanced crypto provider the default. --- dlls/rsaenh/rsaenh.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 0cc4fb4..de3125c 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -4459,7 +4459,8 @@ HRESULT WINAPI DllRegisterServer(void) { static const WCHAR szName[] = { 'N','a','m','e',0 }; static const WCHAR szRSAName[3][54] = { - { 'M','i','c','r','o','s','o','f','t',' ', 'B','a','s','e',' ', + { 'M','i','c','r','o','s','o','f','t',' ', + 'E','n','h','a','n','c','e','d',' ', 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ', 'P','r','o','v','i','d','e','r',' ','v','1','.','0',0 }, { 'M','i','c','r','o','s','o','f','t',' ','R','S','A',' ',

1 0

Andrew Eikum : mshtml: Implement IHTMLLocation::get_hash.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 4ebf01f681b00b56d3ef913234e01d6bf8c702d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ebf01f681b00b56d3ef91323… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 19 11:18:15 2009 -0500 mshtml: Implement IHTMLLocation::get_hash. --- dlls/mshtml/htmllocation.c | 26 ++++++++++++++++++++++++-- dlls/mshtml/tests/htmllocation.c | 12 ++++++------ 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 5f09958..b97cb01 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -480,12 +480,34 @@ static HRESULT WINAPI HTMLLocation_put_hash(IHTMLLocation *iface, BSTR v) static HRESULT WINAPI HTMLLocation_get_hash(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); + URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; + const WCHAR hash[] = {'#',0}; + DWORD hash_pos = 0; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); if(!p) return E_POINTER; - return E_NOTIMPL; + url.dwExtraInfoLength = 1; + hres = get_url_components(This, &url); + if(FAILED(hres)) + return hres; + + if(!url.dwExtraInfoLength){ + *p = NULL; + return S_OK; + } + + hash_pos = strcspnW(url.lpszExtraInfo, hash); + url.dwExtraInfoLength -= hash_pos; + + *p = SysAllocStringLen(url.lpszExtraInfo + hash_pos, url.dwExtraInfoLength); + + if(!*p) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI HTMLLocation_reload(IHTMLLocation *iface, VARIANT_BOOL flag) diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index e4d545e..e6b43e2 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -63,7 +63,7 @@ static const struct location_test http_test = { "80", TRUE, "", TRUE, "?search", FALSE, - "#hash", FALSE + "#hash", TRUE }; static const WCHAR http_file_url[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/','f','i','l','e','?','s','e','a','r','c','h','#','h','a','s','h',0}; @@ -77,7 +77,7 @@ static const struct location_test http_file_test = { "80", TRUE, "file", TRUE, "?search", FALSE, - "#hash", FALSE + "#hash", TRUE }; static const WCHAR ftp_url[] = {'f','t','p',':','/','/','f','t','p','.','w','i','n','e','h','q','.','o','r','g','/',0}; @@ -91,7 +91,7 @@ static const struct location_test ftp_test = { "21", TRUE, "", TRUE, NULL, FALSE, - NULL, FALSE + NULL, TRUE }; static const WCHAR ftp_file_url[] = {'f','t','p',':','/','/','f','t','p','.','w','i','n','e','h','q','.','o','r','g','/','f','i','l','e',0}; @@ -105,7 +105,7 @@ static const struct location_test ftp_file_test = { "21", TRUE, "file", TRUE, NULL, FALSE, - NULL, FALSE + NULL, TRUE }; static const WCHAR file_url[] = {'f','i','l','e',':','/','/','C',':','\\','w','i','n','d','o','w','s','\\','w','i','n','.','i','n','i',0}; @@ -119,7 +119,7 @@ static const struct location_test file_test = { "", TRUE, "C:\\windows\\win.ini", TRUE, NULL, FALSE, - NULL, FALSE + NULL, TRUE }; static int str_eq_wa(LPCWSTR strw, const char *stra) @@ -315,7 +315,7 @@ static void test_hash(IHTMLLocation *loc, const struct location_test *test) test->name, E_POINTER, hres); hres = IHTMLLocation_get_hash(loc, &str); - todo_wine ok(hres == S_OK, "%s: get_hash failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: get_hash failed: 0x%08x\n", test->name, hres); if(hres == S_OK){ if(test->hash_ok) ok(str_eq_wa(str, test->hash),

1 0

Andrew Eikum : mshtml: Implement IHTMLLocation::get_search.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: bbf8a4baf570814aea05111da76d18615ca420af URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbf8a4baf570814aea05111da… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 19 11:18:18 2009 -0500 mshtml: Implement IHTMLLocation::get_search. --- dlls/mshtml/htmllocation.c | 24 ++++++++++++++++++++++-- dlls/mshtml/tests/htmllocation.c | 12 ++++++------ 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index b97cb01..5db5267 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -462,12 +462,32 @@ static HRESULT WINAPI HTMLLocation_put_search(IHTMLLocation *iface, BSTR v) static HRESULT WINAPI HTMLLocation_get_search(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); + URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; + HRESULT hres; + const WCHAR hash[] = {'#',0}; + + TRACE("(%p)->(%p)\n", This, p); if(!p) return E_POINTER; - return E_NOTIMPL; + url.dwExtraInfoLength = 1; + hres = get_url_components(This, &url); + if(FAILED(hres)) + return hres; + + if(!url.dwExtraInfoLength){ + *p = NULL; + return S_OK; + } + + url.dwExtraInfoLength = strcspnW(url.lpszExtraInfo, hash); + + *p = SysAllocStringLen(url.lpszExtraInfo, url.dwExtraInfoLength); + + if(!*p) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI HTMLLocation_put_hash(IHTMLLocation *iface, BSTR v) diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index e6b43e2..b66fe62 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -62,7 +62,7 @@ static const struct location_test http_test = { "www.winehq.org", TRUE, "80", TRUE, "", TRUE, - "?search", FALSE, + "?search", TRUE, "#hash", TRUE }; @@ -76,7 +76,7 @@ static const struct location_test http_file_test = { "www.winehq.org", TRUE, "80", TRUE, "file", TRUE, - "?search", FALSE, + "?search", TRUE, "#hash", TRUE }; @@ -90,7 +90,7 @@ static const struct location_test ftp_test = { "ftp.winehq.org", TRUE, "21", TRUE, "", TRUE, - NULL, FALSE, + NULL, TRUE, NULL, TRUE }; @@ -104,7 +104,7 @@ static const struct location_test ftp_file_test = { "ftp.winehq.org", TRUE, "21", TRUE, "file", TRUE, - NULL, FALSE, + NULL, TRUE, NULL, TRUE }; @@ -118,7 +118,7 @@ static const struct location_test file_test = { NULL, TRUE, "", TRUE, "C:\\windows\\win.ini", TRUE, - NULL, FALSE, + NULL, TRUE, NULL, TRUE }; @@ -291,7 +291,7 @@ static void test_search(IHTMLLocation *loc, const struct location_test *test) test->name, E_POINTER, hres); hres = IHTMLLocation_get_search(loc, &str); - todo_wine ok(hres == S_OK, "%s: get_search failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: get_search failed: 0x%08x\n", test->name, hres); if(hres == S_OK){ if(test->search_ok) ok(str_eq_wa(str, test->search),

1 0

Andrew Eikum : mshtml/tests: Remove todo_wine paths.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: b16634c2f95c1177765eb8dbf34bc99f18c0f96f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b16634c2f95c1177765eb8dbf… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 19 11:18:21 2009 -0500 mshtml/tests: Remove todo_wine paths. --- dlls/mshtml/tests/htmllocation.c | 207 +++++++++++++------------------------- 1 files changed, 72 insertions(+), 135 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b16634c2f95c1177765eb…

1 0

Jacek Caban : jscript: Added SetProperty(SCRIPTPROP_INVOKEVERSIONING) implementation.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 3b2d5ecdf5865f94322b01c033deeba211894732 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b2d5ecdf5865f94322b01c03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 19 20:39:24 2009 +0200 jscript: Added SetProperty(SCRIPTPROP_INVOKEVERSIONING) implementation. --- dlls/jscript/jscript.c | 25 +++++++++++++++++++++- dlls/jscript/jscript.h | 1 + dlls/jscript/tests/jscript.c | 44 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index eb41835..f93962c 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -51,6 +51,7 @@ typedef struct { script_ctx_t *ctx; LONG thread_id; LCID lcid; + DWORD version; IActiveScriptSite *site; @@ -659,6 +660,7 @@ static HRESULT WINAPI JScriptParse_InitNew(IActiveScriptParse *iface) ctx->ref = 1; ctx->state = SCRIPTSTATE_UNINITIALIZED; ctx->safeopt = This->safeopt; + ctx->version = This->version; jsheap_init(&ctx->tmp_heap); ctx = InterlockedCompareExchangePointer((void**)&This->ctx, ctx, NULL); @@ -822,8 +824,27 @@ static HRESULT WINAPI JScriptProperty_SetProperty(IActiveScriptProperty *iface, VARIANT *pvarIndex, VARIANT *pvarValue) { JScript *This = ACTSCPPROP_THIS(iface); - FIXME("(%p)->(%x %p %p)\n", This, dwProperty, pvarIndex, pvarValue); - return E_NOTIMPL; + + TRACE("(%p)->(%x %s %s)\n", This, dwProperty, debugstr_variant(pvarIndex), debugstr_variant(pvarValue)); + + if(pvarIndex) + FIXME("unsupported pvarIndex\n"); + + switch(dwProperty) { + case SCRIPTPROP_INVOKEVERSIONING: + if(V_VT(pvarValue) != VT_I4 || V_I4(pvarValue) < 0 || V_I4(pvarValue) > 15) { + WARN("invalid value %s\n", debugstr_variant(pvarValue)); + return E_INVALIDARG; + } + + This->version = V_I4(pvarValue); + break; + default: + FIXME("Unimplemented property %x\n", dwProperty); + return E_NOTIMPL; + } + + return S_OK; } #undef ACTSCPPROP_THIS diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index af1c1c3..2d7d5d9 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -262,6 +262,7 @@ struct _script_ctx_t { IActiveScriptSite *site; IInternetHostSecurityManager *secmgr; DWORD safeopt; + DWORD version; LCID lcid; jsheap_t tmp_heap; diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index e53fc2d..ed94a89 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -295,6 +295,49 @@ static void test_safety(IUnknown *unk) IObjectSafety_Release(safety); } +static HRESULT set_script_prop(IActiveScript *engine, DWORD property, VARIANT *val) +{ + IActiveScriptProperty *script_prop; + HRESULT hres; + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptProperty, + (void**)&script_prop); + ok(hres == S_OK, "Could not get IActiveScriptProperty iface: %08x\n", hres); + + hres = IActiveScriptProperty_SetProperty(script_prop, property, NULL, val); + IActiveScriptProperty_Release(script_prop); + return hres; +} + +static void test_invoke_versioning(IActiveScript *script) +{ + VARIANT v; + HRESULT hres; + + V_VT(&v) = VT_NULL; + hres = set_script_prop(script, SCRIPTPROP_INVOKEVERSIONING, &v); + if(hres == E_NOTIMPL) { + win_skip("SCRIPTPROP_INVOKESTRING not supported\n"); + return; + } + ok(hres == E_INVALIDARG, "SetProperty(SCRIPTPROP_INVOKEVERSIONING) failed: %08x\n", hres); + + V_VT(&v) = VT_I2; + V_I2(&v) = 0; + hres = set_script_prop(script, SCRIPTPROP_INVOKEVERSIONING, &v); + ok(hres == E_INVALIDARG, "SetProperty(SCRIPTPROP_INVOKEVERSIONING) failed: %08x\n", hres); + + V_VT(&v) = VT_I4; + V_I4(&v) = 16; + hres = set_script_prop(script, SCRIPTPROP_INVOKEVERSIONING, &v); + ok(hres == E_INVALIDARG, "SetProperty(SCRIPTPROP_INVOKEVERSIONING) failed: %08x\n", hres); + + V_VT(&v) = VT_I4; + V_I4(&v) = 2; + hres = set_script_prop(script, SCRIPTPROP_INVOKEVERSIONING, &v); + ok(hres == S_OK, "SetProperty(SCRIPTPROP_INVOKEVERSIONING) failed: %08x\n", hres); +} + static void test_jscript(void) { IActiveScriptParse *parse; @@ -322,6 +365,7 @@ static void test_jscript(void) test_state(script, SCRIPTSTATE_UNINITIALIZED); test_safety(unk); + test_invoke_versioning(script); hres = IActiveScriptParse64_InitNew(parse); ok(hres == S_OK, "InitNew failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Ignore version bits in grfdex.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: be8107a23500e23f07be047bd899c785e6c1a5b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be8107a23500e23f07be047bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 19 20:39:41 2009 +0200 mshtml: Ignore version bits in grfdex. --- dlls/mshtml/dispex.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index fc8bd55..f277e23 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -73,6 +73,8 @@ struct dispex_dynamic_data_t { #define DISPID_DYNPROP_0 0x50000000 #define DISPID_DYNPROP_MAX 0x5fffffff +#define FDEX_VERSION_MASK 0xf0000000 + static ITypeLib *typelib; static ITypeInfo *typeinfos[LAST_tid]; static struct list dispex_data_list = LIST_INIT(dispex_data_list); @@ -743,7 +745,7 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); - if(grfdex & ~(fdexNameCaseSensitive|fdexNameEnsure|fdexNameImplicit)) + if(grfdex & ~(fdexNameCaseSensitive|fdexNameEnsure|fdexNameImplicit|FDEX_VERSION_MASK)) FIXME("Unsupported grfdex %x\n", grfdex); data = get_dispex_data(This);

1 0

Jacek Caban : jscript: Ignore version bits in grfdex.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 48eef3bc671353e4dc64b61c2c9848558c6df974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48eef3bc671353e4dc64b61c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 19 20:39:56 2009 +0200 jscript: Ignore version bits in grfdex. --- dlls/jscript/dispex.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 307efd9..d0a328e 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -30,6 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); static const IID IID_IDispatchJS = {0x719c3050,0xf9d3,0x11cf,{0xa4,0x93,0x00,0x40,0x05,0x23,0xa8,0xa6}}; +#define FDEX_VERSION_MASK 0xf0000000 + typedef enum { PROP_VARIANT, PROP_BUILTIN, @@ -538,7 +540,7 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); - if(grfdex & ~(fdexNameCaseSensitive|fdexNameEnsure|fdexNameImplicit)) { + if(grfdex & ~(fdexNameCaseSensitive|fdexNameEnsure|fdexNameImplicit|FDEX_VERSION_MASK)) { FIXME("Unsupported grfdex %x\n", grfdex); return E_NOTIMPL; } @@ -606,7 +608,7 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bst TRACE("(%p)->(%s %x)\n", This, debugstr_w(bstrName), grfdex); - if(grfdex & ~(fdexNameCaseSensitive|fdexNameEnsure|fdexNameImplicit)) + if(grfdex & ~(fdexNameCaseSensitive|fdexNameEnsure|fdexNameImplicit|FDEX_VERSION_MASK)) FIXME("Unsupported grfdex %x\n", grfdex); hres = find_prop_name(This, bstrName, &prop);

1 0

Jacek Caban : jscript: Pass invoke version to IDispatchEx functions.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: a1ac9d661f8fbd9c782fce554b8ba233edaa92d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1ac9d661f8fbd9c782fce554… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 19 20:40:17 2009 +0200 jscript: Pass invoke version to IDispatchEx functions. --- dlls/jscript/engine.c | 15 ++++++++------- dlls/jscript/jscript.h | 5 +++++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 0cb7851..afb5489 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -223,7 +223,7 @@ void exec_release(exec_ctx_t *ctx) heap_free(ctx); } -static HRESULT disp_get_id(IDispatch *disp, BSTR name, DWORD flags, DISPID *id) +static HRESULT disp_get_id(script_ctx_t *ctx, IDispatch *disp, BSTR name, DWORD flags, DISPID *id) { IDispatchEx *dispex; HRESULT hres; @@ -237,7 +237,7 @@ static HRESULT disp_get_id(IDispatch *disp, BSTR name, DWORD flags, DISPID *id) } *id = 0; - hres = IDispatchEx_GetDispID(dispex, name, flags|fdexNameCaseSensitive, id); + hres = IDispatchEx_GetDispID(dispex, name, make_grfdex(ctx, flags|fdexNameCaseSensitive), id); IDispatchEx_Release(dispex); return hres; } @@ -402,7 +402,7 @@ static BOOL lookup_global_members(script_ctx_t *ctx, BSTR identifier, exprval_t for(item = ctx->named_items; item; item = item->next) { if(item->flags & SCRIPTITEM_GLOBALMEMBERS) { - hres = disp_get_id(item->disp, identifier, 0, &id); + hres = disp_get_id(ctx, item->disp, identifier, 0, &id); if(SUCCEEDED(hres)) { if(ret) exprval_set_idref(ret, item->disp, id); @@ -1423,7 +1423,7 @@ HRESULT array_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, return S_OK; } - hres = disp_get_id(obj, str, flags & EXPR_NEWREF ? fdexNameEnsure : 0, &id); + hres = disp_get_id(ctx->parser->script, obj, str, flags & EXPR_NEWREF ? fdexNameEnsure : 0, &id); } if(SUCCEEDED(hres)) { @@ -1474,7 +1474,7 @@ HRESULT member_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags return S_OK; } - hres = disp_get_id(obj, str, flags & EXPR_NEWREF ? fdexNameEnsure : 0, &id); + hres = disp_get_id(ctx->parser->script, obj, str, flags & EXPR_NEWREF ? fdexNameEnsure : 0, &id); SysFreeString(str); if(SUCCEEDED(hres)) { exprval_set_idref(ret, obj, id); @@ -2068,7 +2068,7 @@ static HRESULT in_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *obj, jsexcept_t if(FAILED(hres)) return hres; - hres = disp_get_id(V_DISPATCH(obj), str, 0, &id); + hres = disp_get_id(ctx->parser->script, V_DISPATCH(obj), str, 0, &id); SysFreeString(str); if(SUCCEEDED(hres)) ret = VARIANT_TRUE; @@ -2308,7 +2308,8 @@ HRESULT delete_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags hres = IDispatch_QueryInterface(exprval.u.nameref.disp, &IID_IDispatchEx, (void**)&dispex); if(SUCCEEDED(hres)) { - hres = IDispatchEx_DeleteMemberByName(dispex, exprval.u.nameref.name, fdexNameCaseSensitive); + hres = IDispatchEx_DeleteMemberByName(dispex, exprval.u.nameref.name, + make_grfdex(ctx->parser->script, fdexNameCaseSensitive)); b = VARIANT_TRUE; IDispatchEx_Release(dispex); } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 2d7d5d9..4dd340e 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -392,6 +392,11 @@ static inline void num_set_inf(VARIANT *v, BOOL positive) #endif } +static inline DWORD make_grfdex(script_ctx_t *ctx, DWORD flags) +{ + return (ctx->version << 28) | flags; +} + const char *debugstr_variant(const VARIANT*); HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**);

1 0

Jacek Caban : jscript: Return array length in Array. unshift for invoke version >= 2.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 96cbc45a528966bff136d3f5214edfb69cafbb58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96cbc45a528966bff136d3f52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 19 20:40:39 2009 +0200 jscript: Return array length in Array.unshift for invoke version >= 2. --- dlls/jscript/array.c | 55 +++++++++++++++++++++++++++---------------------- 1 files changed, 30 insertions(+), 25 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index e4ee4db..8ce35cf 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -967,29 +967,25 @@ static HRESULT Array_unshift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISP return hres; argc = arg_cnt(dp); - if(!argc) { - if(retv) - V_VT(retv) = VT_EMPTY; - return S_OK; - } - - buf_end = buf + sizeof(buf)/sizeof(WCHAR)-1; - *buf_end-- = 0; - i = length; + if(argc) { + buf_end = buf + sizeof(buf)/sizeof(WCHAR)-1; + *buf_end-- = 0; + i = length; - while(i--) { - str = idx_to_str(i, buf_end); + while(i--) { + str = idx_to_str(i, buf_end); - hres = jsdisp_get_id(jsthis, str, 0, &id); - if(SUCCEEDED(hres)) { - hres = jsdisp_propget(jsthis, id, &var, ei, caller); - if(FAILED(hres)) - return hres; + hres = jsdisp_get_id(jsthis, str, 0, &id); + if(SUCCEEDED(hres)) { + hres = jsdisp_propget(jsthis, id, &var, ei, caller); + if(FAILED(hres)) + return hres; - hres = jsdisp_propput_idx(jsthis, i+argc, &var, ei, caller); - VariantClear(&var); - }else if(hres == DISP_E_UNKNOWNNAME) { - hres = IDispatchEx_DeleteMemberByDispID(vthis->u.dispex, id); + hres = jsdisp_propput_idx(jsthis, i+argc, &var, ei, caller); + VariantClear(&var); + }else if(hres == DISP_E_UNKNOWNNAME) { + hres = IDispatchEx_DeleteMemberByDispID(vthis->u.dispex, id); + } } if(FAILED(hres)) @@ -1002,12 +998,21 @@ static HRESULT Array_unshift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISP return hres; } - hres = set_length(jsthis, ei, length+argc); - if(FAILED(hres)) - return hres; + if(argc) { + length += argc; + hres = set_length(jsthis, ei, length); + if(FAILED(hres)) + return hres; + } - if(retv) - V_VT(retv) = VT_EMPTY; + if(retv) { + if(ctx->version < 2) { + V_VT(retv) = VT_EMPTY; + }else { + V_VT(retv) = VT_I4; + V_I4(retv) = length; + } + } return S_OK; }

1 0

Andrew Eikum : mshtml: Reimplement HTMLLocation::get_pathname.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: a03d0bcaa98ee9697962322984188b2bd67c42fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a03d0bcaa98ee969796232298… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 16 11:45:37 2009 -0500 mshtml: Reimplement HTMLLocation::get_pathname. --- dlls/mshtml/htmllocation.c | 27 ++++++--------------------- dlls/mshtml/tests/htmllocation.c | 8 ++++---- 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 4655a63..5f09958 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -428,10 +428,7 @@ static HRESULT WINAPI HTMLLocation_put_pathname(IHTMLLocation *iface, BSTR v) static HRESULT WINAPI HTMLLocation_get_pathname(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); - WCHAR buf[INTERNET_MAX_PATH_LENGTH]; - URL_COMPONENTSW url = {sizeof(url)}; - const WCHAR *doc_url; - DWORD size = 0; + URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; HRESULT hres; TRACE("(%p)->(%p)\n", This, p); @@ -439,29 +436,17 @@ static HRESULT WINAPI HTMLLocation_get_pathname(IHTMLLocation *iface, BSTR *p) if(!p) return E_POINTER; - hres = get_url(This, &doc_url); - if(FAILED(hres)) - return hres; - - hres = CoInternetParseUrl(doc_url, PARSE_PATH_FROM_URL, 0, buf, sizeof(buf), &size, 0); - if(SUCCEEDED(hres)) { - *p = SysAllocString(buf); - if(!*p) - return E_OUTOFMEMORY; - return S_OK; - } - url.dwUrlPathLength = 1; + url.dwExtraInfoLength = 1; hres = get_url_components(This, &url); if(FAILED(hres)) return hres; - if(!url.dwUrlPathLength) { - *p = NULL; - return S_OK; - } + if(url.dwUrlPathLength && url.lpszUrlPath[0] == '/') + *p = SysAllocStringLen(url.lpszUrlPath + 1, url.dwUrlPathLength - 1); + else + *p = SysAllocStringLen(url.lpszUrlPath, url.dwUrlPathLength); - *p = SysAllocStringLen(url.lpszUrlPath, url.dwUrlPathLength); if(!*p) return E_OUTOFMEMORY; return S_OK; diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index 671d460..e4d545e 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -61,7 +61,7 @@ static const struct location_test http_test = { "www.winehq.org:80", TRUE, "www.winehq.org", TRUE, "80", TRUE, - "", FALSE, + "", TRUE, "?search", FALSE, "#hash", FALSE }; @@ -75,7 +75,7 @@ static const struct location_test http_file_test = { "www.winehq.org:80", TRUE, "www.winehq.org", TRUE, "80", TRUE, - "file", FALSE, + "file", TRUE, "?search", FALSE, "#hash", FALSE }; @@ -89,7 +89,7 @@ static const struct location_test ftp_test = { "ftp.winehq.org:21", TRUE, "ftp.winehq.org", TRUE, "21", TRUE, - "", FALSE, + "", TRUE, NULL, FALSE, NULL, FALSE }; @@ -103,7 +103,7 @@ static const struct location_test ftp_file_test = { "ftp.winehq.org:21", TRUE, "ftp.winehq.org", TRUE, "21", TRUE, - "file", FALSE, + "file", TRUE, NULL, FALSE, NULL, FALSE };

1 0