September 2009 - Wine-commits

Jacek Caban : mshtml: Added IOmNavigator::get_userAgent implementation.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: c4bc5be2625b61b4d4e9ec6f70f735014f30118d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4bc5be2625b61b4d4e9ec6f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 2 12:28:07 2009 +0200 mshtml: Added IOmNavigator::get_userAgent implementation. --- dlls/mshtml/omnavigator.c | 20 ++++++++++++++++++-- dlls/mshtml/tests/dom.c | 12 ++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 207464f..dc0fb4a 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -179,8 +179,24 @@ static HRESULT WINAPI OmNavigator_get_appVersion(IOmNavigator *iface, BSTR *p) static HRESULT WINAPI OmNavigator_get_userAgent(IOmNavigator *iface, BSTR *p) { OmNavigator *This = OMNAVIGATOR_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + char user_agent[512]; + DWORD size; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + size = sizeof(user_agent); + hres = ObtainUserAgentString(0, user_agent, &size); + if(FAILED(hres)) + return hres; + + size = MultiByteToWideChar(CP_ACP, 0, user_agent, -1, NULL, 0); + *p = SysAllocStringLen(NULL, size-1); + if(!*p) + return E_OUTOFMEMORY; + + MultiByteToWideChar(CP_ACP, 0, user_agent, -1, *p, size); + return S_OK; } static HRESULT WINAPI OmNavigator_javaEnabled(IOmNavigator *iface, VARIANT_BOOL *enabled) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 266c63d..6c03b0e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2444,6 +2444,8 @@ static void test_navigator(IHTMLDocument2 *doc) { IHTMLWindow2 *window; IOmNavigator *navigator, *navigator2; + char buf[512]; + DWORD size; ULONG ref; BSTR bstr; HRESULT hres; @@ -2501,6 +2503,16 @@ static void test_navigator(IHTMLDocument2 *doc) ok(!strcmp_wa(bstr, "[object]"), "toString returned %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); + size = sizeof(buf); + hres = ObtainUserAgentString(0, buf, &size); + ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres); + + bstr = NULL; + hres = IOmNavigator_get_userAgent(navigator, &bstr); + ok(hres == S_OK, "get_userAgent failed: %08x\n", hres); + ok(!strcmp_wa(bstr, buf), "userAgent returned %s, expected \"%s\"\n", wine_dbgstr_w(bstr), buf); + SysFreeString(bstr); + ref = IOmNavigator_Release(navigator); ok(!ref, "navigator should be destroyed here\n"); }

1 0

Jacek Caban : mshtml: Added IHTMLDocument::writeln implementation.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: 4eead9d09277b230f59a49073b5366bbb39e1bd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eead9d09277b230f59a49073… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 2 12:27:43 2009 +0200 mshtml: Added IHTMLDocument::writeln implementation. --- dlls/mshtml/htmldoc.c | 30 +++++++++++++++++++++--------- dlls/mshtml/tests/dom.c | 10 +++++++--- 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 9e32b27..d5b6cbe 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -901,17 +901,14 @@ static HRESULT WINAPI HTMLDocument_get_nameProp(IHTMLDocument2 *iface, BSTR *p) return E_NOTIMPL; } -static HRESULT WINAPI HTMLDocument_write(IHTMLDocument2 *iface, SAFEARRAY *psarray) +static HRESULT document_write(HTMLDocument *This, SAFEARRAY *psarray, BOOL ln) { - HTMLDocument *This = HTMLDOC_THIS(iface); nsAString nsstr; VARIANT *var; - ULONG i; + ULONG i, argc; nsresult nsres; HRESULT hres; - TRACE("(%p)->(%p)\n", iface, psarray); - if(!This->nsdoc) { WARN("NULL nsdoc\n"); return E_UNEXPECTED; @@ -930,10 +927,14 @@ static HRESULT WINAPI HTMLDocument_write(IHTMLDocument2 *iface, SAFEARRAY *psarr nsAString_Init(&nsstr, NULL); - for(i=0; i < psarray->rgsabound[0].cElements; i++) { + argc = psarray->rgsabound[0].cElements; + for(i=0; i < argc; i++) { if(V_VT(var+i) == VT_BSTR) { nsAString_SetData(&nsstr, V_BSTR(var+i)); - nsres = nsIDOMHTMLDocument_Write(This->nsdoc, &nsstr); + if(!ln || i != argc-1) + nsres = nsIDOMHTMLDocument_Write(This->nsdoc, &nsstr); + else + nsres = nsIDOMHTMLDocument_Writeln(This->nsdoc, &nsstr); if(NS_FAILED(nsres)) ERR("Write failed: %08x\n", nsres); }else { @@ -947,11 +948,22 @@ static HRESULT WINAPI HTMLDocument_write(IHTMLDocument2 *iface, SAFEARRAY *psarr return S_OK; } +static HRESULT WINAPI HTMLDocument_write(IHTMLDocument2 *iface, SAFEARRAY *psarray) +{ + HTMLDocument *This = HTMLDOC_THIS(iface); + + TRACE("(%p)->(%p)\n", iface, psarray); + + return document_write(This, psarray, FALSE); +} + static HRESULT WINAPI HTMLDocument_writeln(IHTMLDocument2 *iface, SAFEARRAY *psarray) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%p)\n", This, psarray); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, psarray); + + return document_write(This, psarray, TRUE); } static HRESULT WINAPI HTMLDocument_open(IHTMLDocument2 *iface, BSTR url, VARIANT name, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5512896..266c63d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4165,7 +4165,7 @@ static void test_table_elem(IHTMLElement *elem) IHTMLTable_Release(table); } -static void doc_write(IHTMLDocument2 *doc, const char *text) +static void doc_write(IHTMLDocument2 *doc, BOOL ln, const char *text) { SAFEARRAYBOUND dim; SAFEARRAY *sa; @@ -4181,7 +4181,10 @@ static void doc_write(IHTMLDocument2 *doc, const char *text) V_BSTR(var) = str = a2bstr(text); SafeArrayUnaccessData(sa); - hres = IHTMLDocument2_write(doc, sa); + if(ln) + hres = IHTMLDocument2_writeln(doc, sa); + else + hres = IHTMLDocument2_write(doc, sa); ok(hres == S_OK, "write failed: %08x\n", hres); SysFreeString(str); @@ -4233,7 +4236,8 @@ static void test_iframe_elem(IHTMLElement *elem) ok(iface_cmp((IUnknown*)disp, (IUnknown*)content_window), "disp != content_window\n"); IDispatch_Release(disp); - doc_write(content_doc, "<html><head><title>test</title></head><body><br /></body></html>"); + doc_write(content_doc, FALSE, "<html><head><title>test</title></head><body><br /></body>"); + doc_write(content_doc, TRUE, "</html>"); hres = IHTMLDocument2_get_all(content_doc, &col); ok(hres == S_OK, "get_all failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Added http loading test.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: 60a85d0749dbb69bc88b1cd38fb67c67a7bde2fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=60a85d0749dbb69bc88b1cd38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 2 12:27:12 2009 +0200 mshtml: Added http loading test. --- dlls/mshtml/tests/htmldoc.c | 270 +++++++++++++++++++++++++++++-------------- 1 files changed, 182 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=60a85d0749dbb69bc88b1…

1 0

Jacek Caban : mshtml: Fixed tests on IE8.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: f9a670a3d6c94a86d160371c1573162c3ba49523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9a670a3d6c94a86d160371c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 2 12:26:54 2009 +0200 mshtml: Fixed tests on IE8. --- dlls/mshtml/tests/htmldoc.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 19cb5ec..217037a 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -201,6 +201,12 @@ static const char *debugstr_guid(REFIID riid) return buf; } +static BOOL is_english(void) +{ + return PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_ENGLISH + && PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; +} + #define EXPECT_UPDATEUI 1 #define EXPECT_SETTITLE 2 @@ -1193,7 +1199,12 @@ static IOleContainer OleContainer = { &OleContainerVtbl }; static HRESULT WINAPI InPlaceFrame_QueryInterface(IOleInPlaceFrame *iface, REFIID riid, void **ppv) { - ok(0, "unexpected call\n"); + static const GUID undocumented_frame_iid = {0xfbece6c9,0x48d7,0x4a37,{0x8f,0xe3,0x6a,0xd4,0x27,0x2f,0xdd,0xac}}; + + if(!IsEqualGUID(&undocumented_frame_iid, riid)) + ok(0, "unexpected riid %s\n", debugstr_guid(riid)); + + *ppv = NULL; return E_NOINTERFACE; } @@ -1249,7 +1260,7 @@ static HRESULT WINAPI InPlaceUIWindow_SetActiveObject(IOleInPlaceFrame *iface, if(expect_InPlaceUIWindow_SetActiveObject_active) { ok(pActiveObject != NULL, "pActiveObject = NULL\n"); - if(pActiveObject && PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_ENGLISH) + if(pActiveObject && is_english()) ok(!lstrcmpW(wszHTML_Document, pszObjName), "pszObjName != \"HTML Document\"\n"); } else { @@ -1269,7 +1280,7 @@ static HRESULT WINAPI InPlaceFrame_SetActiveObject(IOleInPlaceFrame *iface, if(pActiveObject) { CHECK_EXPECT2(SetActiveObject); - if(pActiveObject && PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_ENGLISH) + if(pActiveObject && is_english()) ok(!lstrcmpW(wszHTML_Document, pszObjName), "pszObjName != \"HTML Document\"\n"); }else { CHECK_EXPECT(SetActiveObject_null); @@ -2399,6 +2410,7 @@ static IServiceProvider ServiceProvider = { &ServiceProviderVtbl }; DEFINE_GUID(IID_unk1, 0xD48A6EC6,0x6A4A,0x11CF,0x94,0xA7,0x44,0x45,0x53,0x54,0x00,0x00); /* HTMLWindow2 ? */ DEFINE_GUID(IID_unk2, 0x7BB0B520,0xB1A7,0x11D2,0xBB,0x23,0x00,0xC0,0x4F,0x79,0xAB,0xCD); DEFINE_GUID(IID_unk3, 0x000670BA,0x0000,0x0000,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(IID_unk4, 0x305104a6,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b); static HRESULT QueryInterface(REFIID riid, void **ppv) { @@ -2434,6 +2446,8 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) return E_NOINTERFACE; /* ? */ else if(IsEqualGUID(&IID_unk3, riid)) return E_NOINTERFACE; /* ? */ + else if(IsEqualGUID(&IID_unk4, riid)) + return E_NOINTERFACE; /* ? */ else ok(0, "unexpected riid %s\n", debugstr_guid(riid));

1 0

Jacek Caban : jscript: Added Array.unshift implementation.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: 868bfdbfb38de0ebd15e7ea6297d949886af889a URL: http://source.winehq.org/git/wine.git/?a=commit;h=868bfdbfb38de0ebd15e7ea62… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 2 12:25:57 2009 +0200 jscript: Added Array.unshift implementation. --- dlls/jscript/array.c | 80 +++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 29 ++++++++++++++++ 2 files changed, 106 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index c2c224e..abef9df 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -69,6 +69,21 @@ static HRESULT set_jsdisp_length(DispatchEx *obj, LCID lcid, jsexcept_t *ei, DWO return jsdisp_propput_name(obj, lengthW, lcid, &var, ei, NULL/*FIXME*/); } +static WCHAR *idx_to_str(DWORD idx, WCHAR *ptr) +{ + if(!idx) { + *ptr = '0'; + return ptr; + } + + while(idx) { + *ptr-- = '0' + (idx%10); + idx /= 10; + } + + return ptr+1; +} + static HRESULT Array_length(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { @@ -764,10 +779,69 @@ static HRESULT Array_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, D } static HRESULT Array_unshift(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + WCHAR buf[14], *buf_end, *str; + DWORD argc, i, length; + VARIANT var; + DISPID id; + HRESULT hres; + + TRACE("\n"); + + if(is_class(dispex, JSCLASS_ARRAY)) { + length = ((ArrayInstance*)dispex)->length; + }else { + hres = get_jsdisp_length(dispex, lcid, ei, &length); + if(FAILED(hres)) + 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; + + while(i--) { + str = idx_to_str(i, buf_end); + + hres = jsdisp_get_id(dispex, str, 0, &id); + if(SUCCEEDED(hres)) { + hres = jsdisp_propget(dispex, id, lcid, &var, ei, caller); + if(FAILED(hres)) + return hres; + + hres = jsdisp_propput_idx(dispex, i+argc, lcid, &var, ei, caller); + VariantClear(&var); + }else if(hres == DISP_E_UNKNOWNNAME) { + hres = IDispatchEx_DeleteMemberByDispID(_IDispatchEx_(dispex), id); + } + + if(FAILED(hres)) + return hres; + } + + for(i=0; i<argc; i++) { + hres = jsdisp_propput_idx(dispex, i, lcid, get_arg(dp,i), ei, caller); + if(FAILED(hres)) + return hres; + } + + if(!is_class(dispex, JSCLASS_ARRAY)) { + hres = set_jsdisp_length(dispex, lcid, ei, length+argc); + if(FAILED(hres)) + return hres; + } + + if(retv) + V_VT(retv) = VT_EMPTY; + return S_OK; } static HRESULT Array_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index ca46f25..3b5e834 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -594,6 +594,35 @@ ok(arr.toString() === "a,b,c", "arr.toString() = " + arr.toString()); ok(arr.valueOf === Object.prototype.valueOf, "arr.valueOf !== Object.prototype.valueOf"); ok(arr === arr.valueOf(), "arr !== arr.valueOf"); +arr = [1,2,3]; +tmp = arr.unshift(0); +ok(tmp === undefined, "[1,2,3].unshift(0) returned " +tmp); +ok(arr.length === 4, "arr.length = " + arr.length); +ok(arr.toString() === "0,1,2,3", "arr.toString() = " + arr.toString()); + +arr = new Array(3); +arr[0] = 1; +arr[2] = 3; +tmp = arr.unshift(-1,0); +ok(tmp === undefined, "unshift returned " +tmp); +ok(arr.length === 5, "arr.length = " + arr.length); +ok(arr.toString() === "-1,0,1,,3", "arr.toString() = " + arr.toString()); + +arr = [1,2,3]; +tmp = arr.unshift(); +ok(tmp === undefined, "unshift returned " +tmp); +ok(arr.length === 3, "arr.length = " + arr.length); +ok(arr.toString() === "1,2,3", "arr.toString() = " + arr.toString()); + +arr = new Object(); +arr.length = 2; +arr[0] = 1; +arr[1] = 2; +tmp = Array.prototype.unshift.call(arr, 0); +ok(tmp === undefined, "unshift returned " +tmp); +ok(arr.length === 3, "arr.length = " + arr.length); +ok(arr[0] === 0 && arr[1] === 1 && arr[2] === 2, "unexpected array"); + var num = new Number(6); arr = [0,1,2]; tmp = arr.concat(3, [4,5], num);

1 0

Jacek Caban : jscript: Make Array.slice generic.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: f39d5e46d94fbb9935bdfaddca27d4c553f73c4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f39d5e46d94fbb9935bdfaddc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 2 12:25:39 2009 +0200 jscript: Make Array.slice generic. --- dlls/jscript/array.c | 5 +++-- dlls/jscript/tests/api.js | 9 +++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 1c2b95a..c2c224e 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -456,8 +456,9 @@ static HRESULT Array_slice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS if(is_class(dispex, JSCLASS_ARRAY)) { length = ((ArrayInstance*)dispex)->length; }else { - FIXME("not Array this\n"); - return E_NOTIMPL; + hres = get_jsdisp_length(dispex, lcid, ei, &length); + if(FAILED(hres)) + return hres; } if(arg_cnt(dp)) { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index cff7114..ca46f25 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -628,6 +628,15 @@ arr[12] = 2; ok(arr.slice(5).toString() === "a,,,,,,,2", "arr.slice(5).toString() = " + arr.slice(5).toString()); ok(arr.slice(5).length === 8, "arr.slice(5).length = " + arr.slice(5).length); +obj = new Object(); +obj.length = 3; +obj[0] = 1; +obj[1] = 2; +obj[2] = 3; +tmp = Array.prototype.slice.call(obj, 1, 2); +ok(tmp.length === 1, "tmp.length = " + tmp.length); +ok(tmp[0] === 2, "tmp[0] = " + tmp[0]); + var num = new Number(2); ok(num.toString() === "2", "num(2).toString !== 2"); var num = new Number();

1 0

Jacek Caban : jscript: Added to_primitive on hosting objects test.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: 00644c5449e1ba1307c1435068292427d236da27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00644c5449e1ba1307c143506… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 2 12:25:21 2009 +0200 jscript: Added to_primitive on hosting objects test. --- dlls/jscript/jsutils.c | 4 +++- dlls/jscript/tests/run.c | 32 ++++++++++++++++++++++++++++---- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index a93fb65..5d56661 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -199,8 +199,10 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0}; jsdisp = iface_to_jsdisp((IUnknown*)V_DISPATCH(v)); - if(!jsdisp) + if(!jsdisp) { + V_VT(ret) = VT_EMPTY; return disp_propget(V_DISPATCH(v), DISPID_VALUE, ctx->lcid, ret, ei, NULL /*FIXME*/); + } if(hint == NO_HINT) hint = is_class(jsdisp, JSCLASS_DATE) ? HINT_STRING : HINT_NUMBER; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 0afb180..fe8274f 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -65,6 +65,7 @@ DEFINE_EXPECT(global_success_d); DEFINE_EXPECT(global_success_i); DEFINE_EXPECT(global_notexists_d); DEFINE_EXPECT(testobj_delete); +DEFINE_EXPECT(testobj_value); DEFINE_EXPECT(GetItemInfo_testVal); #define DISPID_GLOBAL_TESTPROPGET 0x1000 @@ -198,11 +199,30 @@ 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, +static HRESULT WINAPI testObj_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + switch(id) { + case DISPID_VALUE: + CHECK_EXPECT(testobj_value); + + ok(wFlags == INVOKE_PROPERTYGET, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgvarg, "rgvarg != NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cArgs, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + ok(pei != NULL, "pei == NULL\n"); + + V_VT(pvarRes) = VT_I4; + V_I4(pvarRes) = 1; + return S_OK; + } + + ok(0, "unexpected call %x\n", id); + return DISP_E_MEMBERNOTFOUND; } static HRESULT WINAPI testObj_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) @@ -223,7 +243,7 @@ static IDispatchExVtbl testObjVtbl = { DispatchEx_GetIDsOfNames, DispatchEx_Invoke, DispatchEx_GetDispID, - DispatchEx_InvokeEx, + testObj_InvokeEx, testObj_DeleteMemberByName, DispatchEx_DeleteMemberByDispID, DispatchEx_GetMemberProperties, @@ -844,6 +864,10 @@ static void run_tests(void) parse_script_a("ok((testObj instanceof Object) === false, 'testObj is instance of Object');"); + SET_EXPECT(testobj_value); + parse_script_a("ok(String(testObj) === '1', 'wrong testObj value');"); + CHECK_CALLED(testobj_value); + run_from_res("lang.js"); run_from_res("api.js"); run_from_res("regexp.js");

1 0

Ge van Geldorp : gdiplus/tests: Fix test on Win7.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: 3b336da9908665be4dc712b98ba959b204d30116 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b336da9908665be4dc712b98… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Wed Sep 2 12:16:54 2009 +0200 gdiplus/tests: Fix test on Win7. --- dlls/gdiplus/tests/pen.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index d2f33f0..59b7cff 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -43,7 +43,7 @@ static void test_startup(void) expect(Ok, status); GdiplusShutdown(gdiplusToken); - gdiplusStartupInput.GdiplusVersion = 2; + gdiplusStartupInput.GdiplusVersion = 42; status = GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); expect(UnsupportedGdiplusVersion, status); @@ -219,7 +219,8 @@ static void test_dasharray(void) /* Try to set with count = 0. */ GdipSetPenDashStyle(pen, DashStyleDot); status = GdipSetPenDashArray(pen, dashes, 0); - expect(OutOfMemory, status); + ok(status == OutOfMemory || status == InvalidParameter, + "Expected OutOfMemory or InvalidParameter, got %.8x\n", status); GdipGetPenDashStyle(pen, &style); expect(DashStyleDot, style);

1 0

Ge van Geldorp : shell32/tests: Fix tests on Vista+.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: 1134f77d5fa7fffe1844d02ac78662334af93d8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1134f77d5fa7fffe1844d02ac… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Wed Sep 2 12:16:01 2009 +0200 shell32/tests: Fix tests on Vista+. --- dlls/shell32/tests/shelllink.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 15a93db..c28c715 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -651,16 +651,12 @@ static void test_load_save(void) static void test_datalink(void) { static const WCHAR lnk[] = { - ':',':','{','9','d','b','1','1','8','6','f','-','4','0','d','f','-','1', + ':',':','{','9','d','b','1','1','8','6','e','-','4','0','d','f','-','1', '1','d','1','-','a','a','8','c','-','0','0','c','0','4','f','b','6','7', - '8','6','3','}',':','{','0','0','0','1','0','4','0','9','-','7','8','E', - '1','-','1','1','D','2','-','B','6','0','F','-','0','0','6','0','9','7', - 'C','9','9','8','E','7','}',':',':','{','9','d','b','1','1','8','6','e', - '-','4','0','d','f','-','1','1','d','1','-','a','a','8','c','-','0','0', - 'c','0','4','f','b','6','7','8','6','3','}',':','2','6',',','!','!','g', - 'x','s','f','(','N','g',']','q','F','`','H','{','L','s','A','C','C','E', - 'S','S','F','i','l','e','s','>','p','l','T',']','j','I','{','j','f','(', - '=','1','&','L','[','-','8','1','-',']',':',':',0 }; + '8','6','3','}',':','2','6',',','!','!','g','x','s','f','(','N','g',']', + 'q','F','`','H','{','L','s','A','C','C','E','S','S','F','i','l','e','s', + '>','p','l','T',']','j','I','{','j','f','(','=','1','&','L','[','-','8', + '1','-',']',':',':',0 }; static const WCHAR comp[] = { '2','6',',','!','!','g','x','s','f','(','N','g',']','q','F','`','H','{', 'L','s','A','C','C','E','S','S','F','i','l','e','s','>','p','l','T',']', @@ -715,7 +711,8 @@ static void test_datalink(void) flags = 0; r = IShellLinkDataList_GetFlags( dl, &flags ); ok( r == S_OK, "GetFlags failed\n"); - ok( flags == (SLDF_HAS_DARWINID|SLDF_HAS_LOGO3ID), + /* SLDF_HAS_LOGO3ID is no longer supported on Vista+, filter it out */ + ok( (flags & (~ SLDF_HAS_LOGO3ID)) == SLDF_HAS_DARWINID, "GetFlags returned wrong flags\n"); dar = NULL;

1 0

Alexandre Julliard : windowscodecs/tests: Avoid size_t in traces.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: be242de9c05868cc8f712485a63e2b9a8137d81b URL: http://source.winehq.org/git/wine.git/?a=commit;h=be242de9c05868cc8f712485a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 2 11:53:16 2009 +0200 windowscodecs/tests: Avoid size_t in traces. --- dlls/windowscodecs/tests/stream.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/tests/stream.c b/dlls/windowscodecs/tests/stream.c index 25459aa..197712e 100644 --- a/dlls/windowscodecs/tests/stream.c +++ b/dlls/windowscodecs/tests/stream.c @@ -104,7 +104,7 @@ static void test_StreamOnMemory(void) LargeInt.QuadPart = -1; hr = IWICStream_Seek(pStream, LargeInt, STREAM_SEEK_END, &uNewPos); ok(hr == S_OK, "Seek returned with %#x, expected %#x\n", hr, S_OK); - ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == sizeof(Memory) - 1, "bSeek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, sizeof(Memory) - 1); + ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == sizeof(Memory) - 1, "bSeek cursor moved to position (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart); IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, &uNewPos); /* reset seek pointer */ LargeInt.QuadPart = -sizeof(Memory) - 5; @@ -140,7 +140,7 @@ static void test_StreamOnMemory(void) hr = IWICStream_Read(pStream, Memory, sizeof(Memory) + 10, &uBytesRead); /* request too many bytes */ ok(hr == S_OK, "Read returned with %#x, expected %#x\n", hr, S_OK); if(SUCCEEDED(hr)) { - ok(uBytesRead == sizeof(Memory), "Read %u bytes, expected %u\n", uBytesRead, sizeof(Memory)); + ok(uBytesRead == sizeof(Memory), "Read %u bytes\n", uBytesRead); ok(memcmp(Memory, CmpMem, uBytesRead) == 0, "Read returned invalid data!\n"); } @@ -164,7 +164,7 @@ static void test_StreamOnMemory(void) hr = IWICStream_Read(pStream, MemBuf, sizeof(Memory) + 10, &uBytesRead); ok(hr == S_OK, "Read returned with %#x, expected %#x\n", hr, S_OK); if(SUCCEEDED(hr)) { - ok(uBytesRead == sizeof(Memory), "Read %u bytes, expected %u\n", uBytesRead, sizeof(Memory)); + ok(uBytesRead == sizeof(Memory), "Read %u bytes\n", uBytesRead); ok(memcmp(Memory, CmpMem, 64) == 0, "Read returned invalid data!\n"); } IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, NULL); @@ -292,7 +292,7 @@ static void test_StreamOnMemory(void) ok(hr == S_OK, "Stat returned %#x, expected %#x\n", hr, S_OK); ok(Stats.pwcsName == NULL, "Stat returned name %p, expected %p\n", Stats.pwcsName, NULL); ok(Stats.type == STGTY_STREAM, "Stat returned type %d, expected %d\n", Stats.type, STGTY_STREAM); - ok(Stats.cbSize.u.HighPart == 0 && Stats.cbSize.u.LowPart == sizeof(Memory), "Stat returned size (%u;%u), expected (%u;%u)\n", Stats.cbSize.u.HighPart, Stats.cbSize.u.LowPart, 0, sizeof(Memory)); + ok(Stats.cbSize.u.HighPart == 0 && Stats.cbSize.u.LowPart == sizeof(Memory), "Stat returned size (%u;%u)\n", Stats.cbSize.u.HighPart, Stats.cbSize.u.LowPart); ok(Stats.mtime.dwHighDateTime == 0 && Stats.mtime.dwLowDateTime == 0, "Stat returned mtime (%u;%u), expected (%u;%u)\n", Stats.mtime.dwHighDateTime, Stats.mtime.dwLowDateTime, 0, 0); ok(Stats.ctime.dwHighDateTime == 0 && Stats.ctime.dwLowDateTime == 0, "Stat returned ctime (%u;%u), expected (%u;%u)\n", Stats.ctime.dwHighDateTime, Stats.ctime.dwLowDateTime, 0, 0); ok(Stats.atime.dwHighDateTime == 0 && Stats.atime.dwLowDateTime == 0, "Stat returned atime (%u;%u), expected (%u;%u)\n", Stats.atime.dwHighDateTime, Stats.atime.dwLowDateTime, 0, 0);

1 0