September 2012 - Wine-commits

Jacek Caban : mshtml: Added support for navigating to anchors with IDs containing '#'.
by Alexandre Julliard 10 Sep '12

10 Sep '12

Module: wine Branch: master Commit: 3f2365d5decc3150db8dd797ba5527b561e24d5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f2365d5decc3150db8dd797b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 10 14:42:39 2012 +0200 mshtml: Added support for navigating to anchors with IDs containing '#'. --- dlls/mshtml/navigate.c | 43 ++++++++++++++++++++++++++++++++++++++++--- dlls/mshtml/nsiface.idl | 11 +++++++++++ 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 91705dd..1046356 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -19,6 +19,7 @@ #include "config.h" #include <stdarg.h> +#include <assert.h> #define COBJMACROS #define NONAMELESSUNION @@ -1925,10 +1926,13 @@ static HRESULT navigate_fragment(HTMLOuterWindow *window, IUri *uri) { nsIDOMLocation *nslocation; nsAString nsfrag_str; + WCHAR *selector; BSTR frag; nsresult nsres; HRESULT hres; + const WCHAR selector_formatW[] = {'a','[','i','d','=','"','%','s','"',']',0}; + set_current_uri(window, uri); nsres = nsIDOMWindow_GetLocation(window->nswindow, &nslocation); @@ -1945,12 +1949,45 @@ static HRESULT navigate_fragment(HTMLOuterWindow *window, IUri *uri) nsres = nsIDOMLocation_SetHash(nslocation, &nsfrag_str); nsAString_Finish(&nsfrag_str); nsIDOMLocation_Release(nslocation); - SysFreeString(frag); - if(NS_FAILED(nsres)) { + if(NS_FAILED(nsres)) ERR("SetHash failed: %08x\n", nsres); - return E_FAIL; + + /* + * IE supports scrolling to anchor elements with "#hash" ids (note that '#' is part of the id), + * while Gecko scrolls only to elements with "hash" ids. We scroll the page ourselves if + * a[id="#hash"] element can be found. + */ + selector = heap_alloc(sizeof(selector_formatW)+SysStringLen(frag)*sizeof(WCHAR)); + if(selector) { + nsIDOMNodeSelector *node_selector; + nsIDOMElement *nselem = NULL; + nsAString selector_str; + + nsres = nsIDOMHTMLDocument_QueryInterface(window->base.inner_window->doc->nsdoc, &IID_nsIDOMNodeSelector, + (void**)&node_selector); + assert(nsres == NS_OK); + + sprintfW(selector, selector_formatW, frag); + nsAString_InitDepend(&selector_str, selector); + /* NOTE: Gecko doesn't set result to NULL if there is no match, so nselem must be initialized */ + nsres = nsIDOMNodeSelector_QuerySelector(node_selector, &selector_str, &nselem); + nsIDOMNodeSelector_Release(node_selector); + nsAString_Finish(&selector_str); + heap_free(selector); + if(NS_SUCCEEDED(nsres) && nselem) { + nsIDOMHTMLElement *html_elem; + + nsres = nsIDOMElement_QueryInterface(nselem, &IID_nsIDOMHTMLElement, (void**)&html_elem); + nsIDOMElement_Release(nselem); + if(NS_SUCCEEDED(nsres)) { + nsIDOMHTMLElement_ScrollIntoView(html_elem, TRUE, 1); + nsIDOMHTMLElement_Release(html_elem); + } + } } + SysFreeString(frag); + if(window->doc_obj->doc_object_service) { IDocObjectService_FireNavigateComplete2(window->doc_obj->doc_object_service, &window->base.IHTMLWindow2_iface, 0x10); IDocObjectService_FireDocumentComplete(window->doc_obj->doc_object_service, &window->base.IHTMLWindow2_iface, 0); diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index d19d5df..a4202f0 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -2073,6 +2073,17 @@ interface nsIDOMHTMLStyleElement : nsIDOMHTMLElement [ object, + uuid(7cebc153-168a-416c-ba5a-56a8c2ddb2ec), + local +] +interface nsIDOMNodeSelector : nsISupports +{ + nsresult QuerySelector(const nsAString *selectors, nsIDOMElement **_retval); + nsresult QuerySelectorAll(const nsAString *selectors, nsIDOMNodeList **_retval); +} + +[ + object, uuid(94928ab3-8b63-11d3-989d-001083010e9b), local ]

1 0

Jacek Caban : jscript: Added support for no new line between break and identifier rule.
by Alexandre Julliard 10 Sep '12

10 Sep '12

Module: wine Branch: master Commit: dc2133cc66e12f8749e467909f5568d8d5054af2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc2133cc66e12f8749e467909… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 10 14:44:51 2012 +0200 jscript: Added support for no new line between break and identifier rule. --- dlls/jscript/engine.h | 1 + dlls/jscript/lex.c | 26 +++++++++++++++----------- dlls/jscript/tests/lang.js | 17 +++++++++++++++++ 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index d0dec0d..b3648af 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -28,6 +28,7 @@ typedef struct { script_ctx_t *script; source_elements_t *source; BOOL nl; + BOOL implicit_nl_semicolon; BOOL is_html; BOOL lexer_error; HRESULT hres; diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index d2b87ac..39a1197 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -68,8 +68,9 @@ static const WCHAR withW[] = {'w','i','t','h',0}; static const struct { const WCHAR *word; int token; + BOOL no_nl; } keywords[] = { - {breakW, kBREAK}, + {breakW, kBREAK, TRUE}, {caseW, kCASE}, {catchW, kCATCH}, {continueW, kCONTINUE}, @@ -161,8 +162,10 @@ static int check_keywords(parser_ctx_t *ctx, const WCHAR **lval) i = (min+max)/2; r = check_keyword(ctx, keywords[i].word, lval); - if(!r) + if(!r) { + ctx->implicit_nl_semicolon = keywords[i].no_nl; return keywords[i].token; + } if(r > 0) min = i+1; @@ -173,14 +176,6 @@ static int check_keywords(parser_ctx_t *ctx, const WCHAR **lval) return 0; } -static void skip_spaces(parser_ctx_t *ctx) -{ - while(ctx->ptr < ctx->end && isspaceW(*ctx->ptr)) { - if(is_endline(*ctx->ptr++)) - ctx->nl = TRUE; - } -} - static BOOL skip_html_comment(parser_ctx_t *ctx) { const WCHAR html_commentW[] = {'<','!','-','-',0}; @@ -509,11 +504,20 @@ static int parse_numeric_literal(parser_ctx_t *ctx, literal_t **literal) static int next_token(parser_ctx_t *ctx, void *lval) { do { - skip_spaces(ctx); + while(ctx->ptr < ctx->end && isspaceW(*ctx->ptr)) { + if(is_endline(*ctx->ptr++)) + ctx->nl = TRUE; + } if(ctx->ptr == ctx->end) return tEOF; }while(skip_comment(ctx) || skip_html_comment(ctx)); + if(ctx->implicit_nl_semicolon) { + if(ctx->nl) + return ';'; + ctx->implicit_nl_semicolon = FALSE; + } + if(isalphaW(*ctx->ptr)) { int ret = check_keywords(ctx, lval); if(ret) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index cb127da..d7f6884 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1355,6 +1355,23 @@ ok(name_override_func === 3, "name_override_func = " + name_override_func); function name_override_func() {}; ok(name_override_func === 3, "name_override_func = " + name_override_func); +/* NoNewline rule parser tests */ +while(true) { + if(true) break + tmp = false +} + +while(true) { + if(true) break /* + * no semicolon, but comment present */ + tmp = false +} + +while(true) { + if(true) break // no semicolon, but comment present + tmp = false +} + /* Keep this test in the end of file */ undefined = 6; ok(undefined === 6, "undefined = " + undefined);

1 0

Jacek Caban : jscript: Added support for no new line between continue and identifier rule.
by Alexandre Julliard 10 Sep '12

10 Sep '12

Module: wine Branch: master Commit: f1642ce1fc4486a28cd5df07a654486075880eb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1642ce1fc4486a28cd5df07a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 10 14:45:06 2012 +0200 jscript: Added support for no new line between continue and identifier rule. --- dlls/jscript/lex.c | 2 +- dlls/jscript/tests/lang.js | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 39a1197..7e0e2fc 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -73,7 +73,7 @@ static const struct { {breakW, kBREAK, TRUE}, {caseW, kCASE}, {catchW, kCATCH}, - {continueW, kCONTINUE}, + {continueW, kCONTINUE, TRUE}, {defaultW, kDEFAULT}, {deleteW, kDELETE}, {doW, kDO}, diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index d7f6884..d3908ad 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1372,6 +1372,12 @@ while(true) { tmp = false } +while(true) { + break + continue + tmp = false +} + /* Keep this test in the end of file */ undefined = 6; ok(undefined === 6, "undefined = " + undefined);

1 0

Jacek Caban : jscript: Added support for no new line between return and expression rule.
by Alexandre Julliard 10 Sep '12

10 Sep '12

Module: wine Branch: master Commit: dd0fe98646036ffc84c31d5ddbb26346b00cc75f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd0fe98646036ffc84c31d5dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 10 14:45:23 2012 +0200 jscript: Added support for no new line between return and expression rule. --- dlls/jscript/lex.c | 2 +- dlls/jscript/tests/lang.js | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 7e0e2fc..4c2cc6b 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -87,7 +87,7 @@ static const struct { {instanceofW, kINSTANCEOF}, {newW, kNEW}, {nullW, kNULL}, - {returnW, kRETURN}, + {returnW, kRETURN, TRUE}, {switchW, kSWITCH}, {thisW, kTHIS}, {throwW, kTHROW}, diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index d3908ad..dbb9d50 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1378,6 +1378,13 @@ while(true) { tmp = false } +function returnTest() { + return + true; +} + +ok(returnTest() === undefined, "returnTest = " + returnTest()); + /* Keep this test in the end of file */ undefined = 6; ok(undefined === 6, "undefined = " + undefined);

1 0

Piotr Caban : msvcrt: Skip RTTI signature==1 tests on platforms that doesn' t support it.
by Alexandre Julliard 10 Sep '12

10 Sep '12

Module: wine Branch: master Commit: 688aa1f529154d1fe9d50d6bebcfe229f8dba632 URL: http://source.winehq.org/git/wine.git/?a=commit;h=688aa1f529154d1fe9d50d6be… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 10 19:06:19 2012 +0200 msvcrt: Skip RTTI signature==1 tests on platforms that doesn't support it. --- dlls/msvcrt/tests/cpp.c | 42 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 34 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index b3dafbb..140d8b2 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -828,6 +828,17 @@ static void test_type_info(void) ok(res == 1, "expected 1, got %d\n", res); } +static inline vtable_ptr *get_vtable( void *obj ) +{ + return *(vtable_ptr **)obj; +} + +static inline void/*rtti_object_locator*/ *get_obj_locator( void *cppobj ) +{ + const vtable_ptr *vtable = get_vtable( cppobj ); + return (void *)vtable[-1]; +} + #ifndef __x86_64__ #define RTTI_SIGNATURE 0 #define DEFINE_RTTI_REF(type, name) type *name @@ -840,6 +851,16 @@ static void test_type_info(void) /* Test RTTI functions */ static void test_rtti(void) { + struct _object_locator + { + unsigned int signature; + int base_class_offset; + unsigned int flags; + DEFINE_RTTI_REF(type_info, type_descriptor); + DEFINE_RTTI_REF(struct _rtti_object_hierarchy, type_hierarchy); + DEFINE_RTTI_REF(void, object_locator); + } *obj_locator; + struct rtti_data { type_info type_info[4]; @@ -867,14 +888,7 @@ static void test_rtti(void) DEFINE_RTTI_REF(struct _rtti_base_array, base_classes); } object_hierarchy; - struct { - unsigned int signature; - int base_class_offset; - unsigned int flags; - DEFINE_RTTI_REF(type_info, type_descriptor); - DEFINE_RTTI_REF(struct _rtti_object_hierarchy, type_hierarchy); - DEFINE_RTTI_REF(void, object_locator); - } object_locator; + struct _object_locator object_locator; } simple_class_rtti = { { {NULL, NULL, "simple_class"} }, { {RTTI_REF(simple_class_rtti, type_info[0]), 0, {0, 0, 0}, 0} }, @@ -897,6 +911,7 @@ static void test_rtti(void) type_info *ti,*bti; exception e,b; void *casted; + BOOL old_signature; if (bAncientVersion || !p__RTCastToVoid || !p__RTtypeid || !pexception_ctor || !pbad_typeid_ctor @@ -906,6 +921,12 @@ static void test_rtti(void) call_func2(pexception_ctor, &e, &e_name); call_func2(pbad_typeid_ctor, &b, e_name); + obj_locator = get_obj_locator(&e); + if(obj_locator->signature!=RTTI_SIGNATURE && sizeof(void*)>sizeof(int)) + old_signature = TRUE; + else + old_signature = FALSE; + /* dynamic_cast to void* */ casted = p__RTCastToVoid(&e); ok (casted == (void*)&e, "failed cast to void\n"); @@ -928,6 +949,11 @@ static void test_rtti(void) call_func1(pexception_dtor, &e); call_func1(pbad_typeid_dtor, &b); + if(old_signature) { + skip("signature==1 is not supported\n"); + return; + } + ti = p__RTtypeid(&simple_class); ok (ti && ti->mangled && !strcmp(ti->mangled, "simple_class"), "incorrect rtti data\n");

1 0

Jacek Caban : mshtml: Use first script host's GUID as default script guid.
by Alexandre Julliard 10 Sep '12

10 Sep '12

Module: wine Branch: master Commit: 156e94429d8bbcf73c194e82864cc9ed2bee1771 URL: http://source.winehq.org/git/wine.git/?a=commit;h=156e94429d8bbcf73c194e828… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 10 10:34:52 2012 +0200 mshtml: Use first script host's GUID as default script guid. --- dlls/mshtml/htmlwindow.c | 1 - dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/script.c | 18 ++++++++++-------- dlls/mshtml/tests/vbtest.html | 15 +++++++++++++-- 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index bdec9b9..ed1fa2b 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2721,7 +2721,6 @@ static HRESULT create_inner_window(HTMLOuterWindow *outer_window, IMoniker *mon, init_dispex(&window->dispex, (IUnknown*)&window->base.IHTMLWindow2_iface, &HTMLWindow_dispex); window->task_magic = get_task_target_magic(); - window->current_script_guid = CLSID_JScript; if(mon) { IMoniker_AddRef(mon); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 18496aa..fa4e073 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -388,7 +388,6 @@ struct HTMLInnerWindow { HTMLDocumentNode *doc; struct list script_hosts; - GUID current_script_guid; IHTMLEventObj *event; diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 0fe4f5a..9aa875a 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -641,8 +641,6 @@ static void parse_text(ScriptHost *script_host, LPCWSTR text) TRACE("%s\n", debugstr_w(text)); - script_host->window->current_script_guid = script_host->guid; - VariantInit(&var); memset(&excepinfo, 0, sizeof(excepinfo)); TRACE(">>>\n"); @@ -722,6 +720,14 @@ static void parse_script_elem(ScriptHost *script_host, nsIDOMHTMLScriptElement * nsAString_Finish(&src_str); } +static GUID get_default_script_guid(HTMLInnerWindow *window) +{ + /* If not specified, we should use very first script host that was created for the page (or JScript if none) */ + return list_empty(&window->script_hosts) + ? CLSID_JScript + : LIST_ENTRY(list_head(&window->script_hosts), ScriptHost, entry)->guid; +} + static BOOL get_guid_from_type(LPCWSTR type, GUID *guid) { const WCHAR text_javascriptW[] = @@ -790,7 +796,7 @@ static BOOL get_script_guid(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *ns if(*language) { ret = get_guid_from_language(language, guid); }else { - *guid = window->current_script_guid; + *guid = get_default_script_guid(window); ret = TRUE; } }else { @@ -871,7 +877,7 @@ IDispatch *script_parse_event(HTMLInnerWindow *window, LPCWSTR text) ptr++; }else { ptr = text; - guid = window->current_script_guid; + guid = get_default_script_guid(window); } if(IsEqualGUID(&CLSID_JScript, &guid) @@ -880,8 +886,6 @@ IDispatch *script_parse_event(HTMLInnerWindow *window, LPCWSTR text) return NULL; } - window->current_script_guid = guid; - script_host = get_script_host(window, &guid); if(!script_host || !script_host->parse_proc) return NULL; @@ -923,8 +927,6 @@ HRESULT exec_script(HTMLInnerWindow *window, const WCHAR *code, const WCHAR *lan return E_FAIL; } - window->current_script_guid = guid; - memset(&ei, 0, sizeof(ei)); TRACE(">>>\n"); hres = IActiveScriptParse_ParseScriptText(script_host->parse, code, NULL, NULL, delimW, 0, 0, SCRIPTTEXT_ISVISIBLE, ret, &ei); diff --git a/dlls/mshtml/tests/vbtest.html b/dlls/mshtml/tests/vbtest.html index 7b8cebc..b864abc 100644 --- a/dlls/mshtml/tests/vbtest.html +++ b/dlls/mshtml/tests/vbtest.html @@ -12,19 +12,30 @@ End Sub <script> ' Verifies that we're in VBScript although there is no type specified If true then counter = counter+1 +function inccounter(x) + counter = counter+x +end function </script> <script type="text/javascript"> // We're in javascript +try { + counter++; + incCounter(2); +}catch(e) { + ok(false, "got an exception"); +} </script> -<script type="text/vbscript"> +<script> ' And back to VBScript If true then counter = counter+1 Sub runTest() - Call ok(counter = 3, "counter = " & counter) + Call ok(counter = 6, "counter = " & counter) Call external.reportSuccess() End Sub </script> +<script type="text/javascript"> +// We're in javascript </script> <body onload="If true then runTest()"> </body>

1 0

Jacek Caban : mshtml: Check if value is function only when it needs to be in invoke_builtin_prop .
by Alexandre Julliard 10 Sep '12

10 Sep '12

Module: wine Branch: master Commit: a4869de7fa5e72fe2daed6bdae11b934f4350aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4869de7fa5e72fe2daed6bda… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 10 10:35:05 2012 +0200 mshtml: Check if value is function only when it needs to be in invoke_builtin_prop. --- dlls/mshtml/dispex.c | 12 ++++++------ dlls/mshtml/tests/vbtest.html | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index a3ac623..eca45a6 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -979,13 +979,13 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD if(FAILED(hres)) return hres; - if(V_VT(&v) != VT_DISPATCH) { - FIXME("Not a function %s\n", debugstr_variant(&v)); - VariantClear(&v); - return E_FAIL; - } - if(flags != (DISPATCH_PROPERTYGET|DISPATCH_METHOD)) { + if(V_VT(&v) != VT_DISPATCH) { + FIXME("Not a function %s\n", debugstr_variant(&v)); + VariantClear(&v); + return E_FAIL; + } + hres = invoke_disp_value(This, V_DISPATCH(&v), lcid, flags, dp, res, ei, caller); IDispatch_Release(V_DISPATCH(&v)); }else if(res) { diff --git a/dlls/mshtml/tests/vbtest.html b/dlls/mshtml/tests/vbtest.html index b864abc..f424b38 100644 --- a/dlls/mshtml/tests/vbtest.html +++ b/dlls/mshtml/tests/vbtest.html @@ -31,6 +31,7 @@ If true then counter = counter+1 Sub runTest() Call ok(counter = 6, "counter = " & counter) + Call ok(isNull(document.onkeyup), "document.onkeyup is not null") Call external.reportSuccess() End Sub </script>

1 0

Jacek Caban : vbscript: Added support for comparing to null.
by Alexandre Julliard 10 Sep '12

10 Sep '12

Module: wine Branch: master Commit: 167174d88b69c8b10c27d08a240c91db9d5088b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=167174d88b69c8b10c27d08a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 10 10:35:17 2012 +0200 vbscript: Added support for comparing to null. --- dlls/vbscript/interp.c | 30 ++++++++++++++++++++---------- dlls/vbscript/tests/lang.vbs | 13 +++++++++++++ 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 28c1b14..3a078b5 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -279,6 +279,13 @@ static HRESULT stack_push(exec_ctx_t *ctx, VARIANT *v) return S_OK; } +static inline HRESULT stack_push_null(exec_ctx_t *ctx) +{ + VARIANT v; + V_VT(&v) = VT_NULL; + return stack_push(ctx, &v); +} + static void stack_popn(exec_ctx_t *ctx, unsigned n) { while(n--) @@ -1143,12 +1150,8 @@ static HRESULT interp_empty(exec_ctx_t *ctx) static HRESULT interp_null(exec_ctx_t *ctx) { - VARIANT v; - TRACE("\n"); - - V_VT(&v) = VT_NULL; - return stack_push(ctx, &v); + return stack_push_null(ctx); } static HRESULT interp_nothing(exec_ctx_t *ctx) @@ -1306,11 +1309,6 @@ static HRESULT var_cmp(exec_ctx_t *ctx, VARIANT *l, VARIANT *r) { TRACE("%s %s\n", debugstr_variant(l), debugstr_variant(r)); - if(V_VT(l) == VT_NULL || V_VT(r) == VT_NULL) { - FIXME("comparing nulls is not implemented\n"); - return E_NOTIMPL; - } - /* FIXME: Fix comparing string to number */ return VarCmp(l, r, ctx->script->lcid, 0); @@ -1345,6 +1343,8 @@ static HRESULT interp_equal(exec_ctx_t *ctx) hres = cmp_oper(ctx); if(FAILED(hres)) return hres; + if(hres == VARCMP_NULL) + return stack_push_null(ctx); V_VT(&v) = VT_BOOL; V_BOOL(&v) = hres == VARCMP_EQ ? VARIANT_TRUE : VARIANT_FALSE; @@ -1361,6 +1361,8 @@ static HRESULT interp_nequal(exec_ctx_t *ctx) hres = cmp_oper(ctx); if(FAILED(hres)) return hres; + if(hres == VARCMP_NULL) + return stack_push_null(ctx); V_VT(&v) = VT_BOOL; V_BOOL(&v) = hres != VARCMP_EQ ? VARIANT_TRUE : VARIANT_FALSE; @@ -1377,6 +1379,8 @@ static HRESULT interp_gt(exec_ctx_t *ctx) hres = cmp_oper(ctx); if(FAILED(hres)) return hres; + if(hres == VARCMP_NULL) + return stack_push_null(ctx); V_VT(&v) = VT_BOOL; V_BOOL(&v) = hres == VARCMP_GT ? VARIANT_TRUE : VARIANT_FALSE; @@ -1393,6 +1397,8 @@ static HRESULT interp_gteq(exec_ctx_t *ctx) hres = cmp_oper(ctx); if(FAILED(hres)) return hres; + if(hres == VARCMP_NULL) + return stack_push_null(ctx); V_VT(&v) = VT_BOOL; V_BOOL(&v) = hres == VARCMP_GT || hres == VARCMP_EQ ? VARIANT_TRUE : VARIANT_FALSE; @@ -1409,6 +1415,8 @@ static HRESULT interp_lt(exec_ctx_t *ctx) hres = cmp_oper(ctx); if(FAILED(hres)) return hres; + if(hres == VARCMP_NULL) + return stack_push_null(ctx); V_VT(&v) = VT_BOOL; V_BOOL(&v) = hres == VARCMP_LT ? VARIANT_TRUE : VARIANT_FALSE; @@ -1425,6 +1433,8 @@ static HRESULT interp_lteq(exec_ctx_t *ctx) hres = cmp_oper(ctx); if(FAILED(hres)) return hres; + if(hres == VARCMP_NULL) + return stack_push_null(ctx); V_VT(&v) = VT_BOOL; V_BOOL(&v) = hres == VARCMP_LT || hres == VARCMP_EQ ? VARIANT_TRUE : VARIANT_FALSE; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 2ba3e5a..3e105b6 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -144,6 +144,19 @@ Call ok(1 = 1 < 0, "! 1 = 1 < 0") Call ok(1 <= 2, "! 1 <= 2") Call ok(2 <= 2, "! 2 <= 2") +Call ok(isNull(0 = null), "'(0 = null)' is not null") +Call ok(isNull(null = 1), "'(null = 1)' is not null") +Call ok(isNull(0 > null), "'(0 > null)' is not null") +Call ok(isNull(null > 1), "'(null > 1)' is not null") +Call ok(isNull(0 < null), "'(0 < null)' is not null") +Call ok(isNull(null < 1), "'(null < 1)' is not null") +Call ok(isNull(0 <> null), "'(0 <> null)' is not null") +Call ok(isNull(null <> 1), "'(null <> 1)' is not null") +Call ok(isNull(0 >= null), "'(0 >= null)' is not null") +Call ok(isNull(null >= 1), "'(null >= 1)' is not null") +Call ok(isNull(0 <= null), "'(0 <= null)' is not null") +Call ok(isNull(null <= 1), "'(null <= 1)' is not null") + x = 3 Call ok(2+2 = 4, "2+2 = " & (2+2)) Call ok(false + 6 + true = 5, "false + 6 + true <> 5")

1 0

Jacek Caban : vbscript: Added support for VT_NULL in stack_pop_bool.
by Alexandre Julliard 10 Sep '12

10 Sep '12

Module: wine Branch: master Commit: 81766a740e1c1816ba3869bf41832a3532ffa819 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81766a740e1c1816ba3869bf4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 10 10:35:29 2012 +0200 vbscript: Added support for VT_NULL in stack_pop_bool. --- dlls/vbscript/interp.c | 3 +++ dlls/vbscript/tests/lang.vbs | 6 ++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 3a078b5..3a5d9b2 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -373,6 +373,9 @@ static int stack_pop_bool(exec_ctx_t *ctx, BOOL *b) case VT_BOOL: *b = V_BOOL(val.v); break; + case VT_NULL: + *b = FALSE; + break; case VT_I2: *b = V_I2(val.v); break; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 3e105b6..90d5304 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -434,6 +434,12 @@ do while true next loop +if null then call ok(false, "if null evaluated") + +while null + call ok(false, "while null evaluated") +wend + Call collectionObj.reset() y = 0 x = 10

1 0

Dmitry Timoshkov : windowscodecs: Add more tests for PNG metadata.
by Alexandre Julliard 10 Sep '12

10 Sep '12

Module: wine Branch: master Commit: 44e6a494d9d4e225e94b3dca67c9ef3d108d2f34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44e6a494d9d4e225e94b3dca6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 10 16:25:00 2012 +0900 windowscodecs: Add more tests for PNG metadata. --- dlls/windowscodecs/tests/metadata.c | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index acd9255..807e00a 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -504,9 +504,10 @@ struct test_data int count; /* if VT_VECTOR */ LONGLONG value[13]; const char *string; + const WCHAR id_string[32]; }; -static void compare_ifd_metadata(IWICMetadataReader *reader, const struct test_data *td, ULONG count) +static void compare_metadata(IWICMetadataReader *reader, const struct test_data *td, ULONG count) { HRESULT hr; IWICEnumMetadataItem *enumerator; @@ -530,8 +531,13 @@ static void compare_ifd_metadata(IWICMetadataReader *reader, const struct test_d ok(items_returned == 1, "unexpected item count %u\n", items_returned); ok(schema.vt == VT_EMPTY, "%u: unexpected vt: %u\n", i, schema.vt); - ok(id.vt == VT_UI2, "%u: unexpected vt: %u\n", i, id.vt); - ok(U(id).uiVal == td[i].id, "%u: expected id %#x, got %#x\n", i, td[i].id, U(id).uiVal); + ok(id.vt == VT_UI2 || id.vt == VT_LPWSTR, "%u: unexpected vt: %u\n", i, id.vt); + if (id.vt == VT_UI2) + ok(U(id).uiVal == td[i].id, "%u: expected id %#x, got %#x\n", i, td[i].id, U(id).uiVal); + else if (id.vt == VT_LPWSTR) + ok(!lstrcmpW(td[i].id_string, U(id).pwszVal), + "%u: expected %s, got %s\n", i, wine_dbgstr_w(td[i].id_string), wine_dbgstr_w(U(id).pwszVal)); + ok(value.vt == td[i].type, "%u: expected vt %#x, got %#x\n", i, td[i].type, value.vt); if (value.vt & VT_VECTOR) { @@ -670,7 +676,7 @@ static void test_metadata_IFD(void) ok(hr == S_OK, "GetCount error %#x\n", hr); ok(count == sizeof(td)/sizeof(td[0]), "unexpected count %u\n", count); - compare_ifd_metadata(reader, td, count); + compare_metadata(reader, td, count); /* test IFD data with different endianness */ if (persist_options == WICPersistOptionsLittleEndian) @@ -685,7 +691,7 @@ static void test_metadata_IFD(void) hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); ok(count == sizeof(td)/sizeof(td[0]), "unexpected count %u\n", count); - compare_ifd_metadata(reader, td, count); + compare_metadata(reader, td, count); HeapFree(GetProcessHeap(), 0, IFD_data_swapped); hr = IWICMetadataReader_GetMetadataFormat(reader, &format); @@ -864,6 +870,15 @@ todo_wine static void test_metadata_png(void) { + static const struct test_data td[6] = + { + { VT_UI2, 0, 0, { 2005 }, NULL, { 'Y','e','a','r',0 } }, + { VT_UI1, 0, 0, { 6 }, NULL, { 'M','o','n','t','h',0 } }, + { VT_UI1, 0, 0, { 3 }, NULL, { 'D','a','y',0 } }, + { VT_UI1, 0, 0, { 15 }, NULL, { 'H','o','u','r',0 } }, + { VT_UI1, 0, 0, { 7 }, NULL, { 'M','i','n','u','t','e',0 } }, + { VT_UI1, 0, 0, { 45 }, NULL, { 'S','e','c','o','n','d',0 } } + }; IStream *stream; IWICBitmapDecoder *decoder; IWICBitmapFrameDecode *frame; @@ -926,6 +941,12 @@ static void test_metadata_png(void) broken(IsEqualGUID(&containerformat, &GUID_MetadataFormatUnknown)) /* Windows XP */, "unexpected container format\n"); + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount error %#x\n", hr); + ok(count == 6 || broken(count == 1) /* XP */, "expected 6, got %u\n", count); + if (count == 6) + compare_metadata(reader, td, count); + IWICMetadataReader_Release(reader); }

1 0