September 2012 - Wine-Commits

Jacek Caban : jscript: Added support for no new line between return and expression rule.
by Alexandre Julliard Sept. 10, 2012

Sept. 10, 2012

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 Sept. 10, 2012

Sept. 10, 2012

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 : jscript: Added support for no new line between continue and identifier rule.
by Alexandre Julliard Sept. 10, 2012

Sept. 10, 2012

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 : mshtml: Added support for navigating to anchors with IDs containing '#'.
by Alexandre Julliard Sept. 10, 2012

Sept. 10, 2012

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 Sept. 10, 2012

Sept. 10, 2012

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 : vbscript: Added support for VT_NULL in stack_pop_bool.
by Alexandre Julliard Sept. 10, 2012

Sept. 10, 2012

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 : include/wincodecsdk.idl: Fix a typo.
by Alexandre Julliard Sept. 10, 2012

Sept. 10, 2012

Module: wine Branch: master Commit: 3ea74413c68e0b7e4f720121a2a704ae4f33335e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea74413c68e0b7e4f720121a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 10 16:26:31 2012 +0900 include/wincodecsdk.idl: Fix a typo. --- dlls/windowscodecs/tests/info.c | 4 ++-- include/wincodecsdk.idl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index 6eb20cb..6c393d7 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -422,7 +422,7 @@ todo_wine IWICComponentInfo_Release(info); - hr = IWICImagingFactory_CreateComponentInfo(factory, &CLSID_WICXMBStructMetadataReader, &info); + hr = IWICImagingFactory_CreateComponentInfo(factory, &CLSID_WICXMPStructMetadataReader, &info); todo_wine ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr); @@ -440,7 +440,7 @@ todo_wine hr = IWICMetadataReaderInfo_GetCLSID(reader_info, &clsid); ok(hr == S_OK, "GetCLSID failed, hr=%x\n", hr); - ok(IsEqualGUID(&CLSID_WICXMBStructMetadataReader, &clsid), "GetCLSID returned wrong result\n"); + ok(IsEqualGUID(&CLSID_WICXMPStructMetadataReader, &clsid), "GetCLSID returned wrong result\n"); hr = IWICMetadataReaderInfo_GetMetadataFormat(reader_info, &clsid); ok(hr == S_OK, "GetMetadataFormat failed, hr=%x\n", hr); diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index db5162a..e681c64 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -53,7 +53,7 @@ cpp_quote("DEFINE_GUID(CLSID_WICPngTextMetadataReader, 0x4b59afcc,0xb8c3,0x408a, cpp_quote("DEFINE_GUID(CLSID_WICPngTextMetadataWriter, 0xb5ebafb9,0x253e,0x4a72,0xa7,0x44,0x07,0x62,0xd2,0x68,0x56,0x83);") cpp_quote("DEFINE_GUID(CLSID_WICIfdMetadataReader, 0x8f914656,0x9d0a,0x4eb2,0x90,0x19,0x0b,0xf9,0x6d,0x8a,0x9e,0xe6);") cpp_quote("DEFINE_GUID(CLSID_WICExifMetadataReader, 0xd9403860,0x297f,0x4a49,0xbf,0x9b,0x77,0x89,0x81,0x50,0xa4,0x42);") -cpp_quote("DEFINE_GUID(CLSID_WICXMBStructMetadataReader, 0x01b90d9a,0x8209,0x47f7,0x9c,0x52,0xe1,0x24,0x4b,0xf5,0x0c,0xed);") +cpp_quote("DEFINE_GUID(CLSID_WICXMPStructMetadataReader, 0x01b90d9a,0x8209,0x47f7,0x9c,0x52,0xe1,0x24,0x4b,0xf5,0x0c,0xed);") typedef struct WICMetadataPattern { ULARGE_INTEGER Position;

1 0

Jacek Caban : mshtml: Added support for DISPATCH_METHOD|DISPATCH_PROPERTYGET flags in HTMLDocumentNode_invoke .
by Alexandre Julliard Sept. 10, 2012

Sept. 10, 2012

Module: wine Branch: master Commit: bdcc88a3968deb0bc50f82aeec72018f041b7176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdcc88a3968deb0bc50f82aee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 10 14:41:09 2012 +0200 mshtml: Added support for DISPATCH_METHOD|DISPATCH_PROPERTYGET flags in HTMLDocumentNode_invoke. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/tests/vbtest.html | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 86615df..a6bb56d 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2183,7 +2183,7 @@ static HRESULT HTMLDocumentNode_invoke(DispatchEx *dispex, DISPID id, LCID lcid, nsresult nsres; HRESULT hres; - if(flags != DISPATCH_PROPERTYGET) { + if(flags != DISPATCH_PROPERTYGET && flags != (DISPATCH_METHOD|DISPATCH_PROPERTYGET)) { FIXME("unsupported flags %x\n", flags); return E_NOTIMPL; } diff --git a/dlls/mshtml/tests/vbtest.html b/dlls/mshtml/tests/vbtest.html index f424b38..f023f98 100644 --- a/dlls/mshtml/tests/vbtest.html +++ b/dlls/mshtml/tests/vbtest.html @@ -32,6 +32,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 ok(document.formname.tagName = "FORM", "document.form.tagName = " & document.formname.tagName) Call external.reportSuccess() End Sub </script> @@ -39,5 +40,6 @@ End Sub // We're in javascript </script> <body onload="If true then runTest()"> +<form name="formname"></form> </body> </html>

1 0

Alexandre Julliard : winex11: Remove support for icon windows, use a default icon instead.
by Alexandre Julliard Sept. 10, 2012

Sept. 10, 2012

Module: wine Branch: master Commit: 64dc6561cd2b890867f810ac2220d99a04499b2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=64dc6561cd2b890867f810ac2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 4 17:14:46 2012 +0200 winex11: Remove support for icon windows, use a default icon instead. --- dlls/winex11.drv/window.c | 137 ++++++++++++-------------------------------- dlls/winex11.drv/x11drv.h | 1 - 2 files changed, 38 insertions(+), 100 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 16034ea..07f9d26 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -82,7 +82,6 @@ static Window user_time_window; static const char foreign_window_prop[] = "__wine_x11_foreign_window"; static const char whole_window_prop[] = "__wine_x11_whole_window"; -static const char icon_window_prop[] = "__wine_x11_icon_window"; static const char clip_window_prop[] = "__wine_x11_clip_window"; static const char managed_prop[] = "__wine_x11_managed"; @@ -449,48 +448,6 @@ static void sync_window_text( Display *display, Window win, const WCHAR *text ) /*********************************************************************** - * create_icon_window - */ -static Window create_icon_window( Display *display, struct x11drv_win_data *data ) -{ - XSetWindowAttributes attr; - - attr.event_mask = (ExposureMask | KeyPressMask | KeyReleaseMask | PointerMotionMask | - ButtonPressMask | ButtonReleaseMask | EnterWindowMask); - attr.bit_gravity = NorthWestGravity; - attr.backing_store = NotUseful/*WhenMapped*/; - attr.colormap = X11DRV_PALETTE_PaletteXColormap; /* Needed due to our visual */ - - data->icon_window = XCreateWindow( display, root_window, 0, 0, - GetSystemMetrics( SM_CXICON ), - GetSystemMetrics( SM_CYICON ), - 0, screen_depth, - InputOutput, visual, - CWEventMask | CWBitGravity | CWBackingStore | CWColormap, &attr ); - XSaveContext( display, data->icon_window, winContext, (char *)data->hwnd ); - XFlush( display ); /* make sure the window exists before we start painting to it */ - - TRACE( "created %lx\n", data->icon_window ); - SetPropA( data->hwnd, icon_window_prop, (HANDLE)data->icon_window ); - return data->icon_window; -} - - - -/*********************************************************************** - * destroy_icon_window - */ -static void destroy_icon_window( Display *display, struct x11drv_win_data *data ) -{ - if (!data->icon_window) return; - XDeleteContext( display, data->icon_window, winContext ); - XDestroyWindow( display, data->icon_window ); - data->icon_window = 0; - RemovePropA( data->hwnd, icon_window_prop ); -} - - -/*********************************************************************** * get_bitmap_argb * * Return the bitmap bits in ARGB format. Helper for setting icon hints. @@ -624,11 +581,16 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data, HICON icon_big, HICON icon_small ) { XWMHints *hints = data->wm_hints; + ICONINFO ii, ii_small; + HDC hDC; + unsigned int size; + unsigned long *bits; if (!icon_big) { icon_big = (HICON)SendMessageW( data->hwnd, WM_GETICON, ICON_BIG, 0 ); if (!icon_big) icon_big = (HICON)GetClassLongPtrW( data->hwnd, GCLP_HICON ); + if (!icon_big) icon_big = LoadIconW( 0, (LPWSTR)IDI_WINLOGO ); } if (!icon_small) { @@ -640,63 +602,46 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data, if (data->icon_mask) XFreePixmap( gdi_display, data->icon_mask ); data->icon_pixmap = data->icon_mask = 0; - if (!icon_big) - { - if (!data->icon_window) create_icon_window( display, data ); - hints->icon_window = data->icon_window; - hints->flags = (hints->flags & ~(IconPixmapHint | IconMaskHint)) | IconWindowHint; - } - else - { - ICONINFO ii, ii_small; - HDC hDC; - unsigned int size; - unsigned long *bits; + if (!GetIconInfo(icon_big, &ii)) return; - if (!GetIconInfo(icon_big, &ii)) return; + hDC = CreateCompatibleDC(0); + bits = get_bitmap_argb( hDC, ii.hbmColor, ii.hbmMask, &size ); + if (bits && GetIconInfo( icon_small, &ii_small )) + { + unsigned int size_small; + unsigned long *bits_small, *new; - hDC = CreateCompatibleDC(0); - bits = get_bitmap_argb( hDC, ii.hbmColor, ii.hbmMask, &size ); - if (bits && GetIconInfo( icon_small, &ii_small )) + if ((bits_small = get_bitmap_argb( hDC, ii_small.hbmColor, ii_small.hbmMask, &size_small )) && + (bits_small[0] != bits[0] || bits_small[1] != bits[1])) /* size must be different */ { - unsigned int size_small; - unsigned long *bits_small, *new; - - if ((bits_small = get_bitmap_argb( hDC, ii_small.hbmColor, ii_small.hbmMask, &size_small )) && - (bits_small[0] != bits[0] || bits_small[1] != bits[1])) /* size must be different */ + if ((new = HeapReAlloc( GetProcessHeap(), 0, bits, + (size + size_small) * sizeof(unsigned long) ))) { - if ((new = HeapReAlloc( GetProcessHeap(), 0, bits, - (size + size_small) * sizeof(unsigned long) ))) - { - bits = new; - memcpy( bits + size, bits_small, size_small * sizeof(unsigned long) ); - size += size_small; - } + bits = new; + memcpy( bits + size, bits_small, size_small * sizeof(unsigned long) ); + size += size_small; } - HeapFree( GetProcessHeap(), 0, bits_small ); - DeleteObject( ii_small.hbmColor ); - DeleteObject( ii_small.hbmMask ); } - if (bits) - XChangeProperty( display, data->whole_window, x11drv_atom(_NET_WM_ICON), - XA_CARDINAL, 32, PropModeReplace, (unsigned char *)bits, size ); - else - XDeleteProperty( display, data->whole_window, x11drv_atom(_NET_WM_ICON) ); - HeapFree( GetProcessHeap(), 0, bits ); - - if (create_icon_pixmaps( hDC, &ii, data )) - { - hints->icon_pixmap = data->icon_pixmap; - hints->icon_mask = data->icon_mask; - hints->flags |= IconPixmapHint | IconMaskHint; - } - destroy_icon_window( display, data ); - hints->flags &= ~IconWindowHint; + HeapFree( GetProcessHeap(), 0, bits_small ); + DeleteObject( ii_small.hbmColor ); + DeleteObject( ii_small.hbmMask ); + } + if (bits) + XChangeProperty( display, data->whole_window, x11drv_atom(_NET_WM_ICON), + XA_CARDINAL, 32, PropModeReplace, (unsigned char *)bits, size ); + else + XDeleteProperty( display, data->whole_window, x11drv_atom(_NET_WM_ICON) ); + HeapFree( GetProcessHeap(), 0, bits ); - DeleteObject( ii.hbmColor ); - DeleteObject( ii.hbmMask ); - DeleteDC(hDC); + if (create_icon_pixmaps( hDC, &ii, data )) + { + hints->icon_pixmap = data->icon_pixmap; + hints->icon_mask = data->icon_mask; + hints->flags |= IconPixmapHint | IconMaskHint; } + DeleteObject( ii.hbmColor ); + DeleteObject( ii.hbmMask ); + DeleteDC(hDC); } @@ -1518,7 +1463,6 @@ void CDECL X11DRV_DestroyWindow( HWND hwnd ) destroy_gl_drawable( hwnd ); destroy_whole_window( thread_data->display, data, FALSE ); - destroy_icon_window( thread_data->display, data ); if (thread_data->last_focus == hwnd) thread_data->last_focus = 0; if (thread_data->last_xic_hwnd == hwnd) thread_data->last_xic_hwnd = 0; @@ -1864,11 +1808,7 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, if (top == hwnd) { - if (data && IsIconic( hwnd ) && data->icon_window) - { - escape.drawable = data->icon_window; - } - else escape.drawable = data ? data->whole_window : X11DRV_get_whole_window( hwnd ); + escape.drawable = data ? data->whole_window : X11DRV_get_whole_window( hwnd ); /* special case: when repainting the root window, clip out top-level windows */ if (data && data->whole_window == root_window) escape.mode = ClipByChildren; @@ -1962,7 +1902,6 @@ void CDECL X11DRV_SetParent( HWND hwnd, HWND parent, HWND old_parent ) { /* destroy the old X windows */ destroy_whole_window( display, data, FALSE ); - destroy_icon_window( display, data ); if (data->managed) { data->managed = FALSE; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 1c4c341..c637a67 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -533,7 +533,6 @@ struct x11drv_win_data { HWND hwnd; /* hwnd that this private data belongs to */ Window whole_window; /* X window for the complete window */ - Window icon_window; /* X window for the icon */ RECT window_rect; /* USER window rectangle relative to parent */ RECT whole_rect; /* X window rectangle for the whole window relative to parent */ RECT client_rect; /* client area relative to parent */

1 0

Jacek Caban : vbscript: Added support for comparing to null.
by Alexandre Julliard Sept. 10, 2012

Sept. 10, 2012

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