wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

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 : 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

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 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 : 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 : mshtml: Added IHTMLWindow2::onscroll implementation.
by Alexandre Julliard 10 Sep '12

10 Sep '12

Module: wine Branch: master Commit: 7293e84163297bca1c06e9fd86e2ca21956b968d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7293e84163297bca1c06e9fd8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 10 14:41:28 2012 +0200 mshtml: Added IHTMLWindow2::onscroll implementation. --- dlls/mshtml/htmlevent.c | 5 +++++ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlwindow.c | 12 ++++++++---- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index f5880f9..f9f21df 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -113,6 +113,9 @@ static const WCHAR onreadystatechangeW[] = {'o','n','r','e','a','d','y','s','t', static const WCHAR resizeW[] = {'r','e','s','i','z','e',0}; static const WCHAR onresizeW[] = {'o','n','r','e','s','i','z','e',0}; +static const WCHAR scrollW[] = {'s','c','r','o','l','l',0}; +static const WCHAR onscrollW[] = {'o','n','s','c','r','o','l','l',0}; + static const WCHAR selectstartW[] = {'s','e','l','e','c','t','s','t','a','r','t',0}; static const WCHAR onselectstartW[] = {'o','n','s','e','l','e','c','t','s','t','a','r','t',0}; @@ -199,6 +202,8 @@ static const event_info_t event_info[] = { 0}, {resizeW, onresizeW, EVENTT_NONE, DISPID_EVMETH_ONRESIZE, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {scrollW, onscrollW, EVENTT_HTML, DISPID_EVMETH_ONSCROLL, + EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {selectstartW, onselectstartW, EVENTT_MOUSE, DISPID_EVMETH_ONSELECTSTART, EVENT_CANCELABLE}, {submitW, onsubmitW, EVENTT_HTML, DISPID_EVMETH_ONSUBMIT, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index b6ebf81..983d128 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -40,6 +40,7 @@ typedef enum { EVENTID_PASTE, EVENTID_READYSTATECHANGE, EVENTID_RESIZE, + EVENTID_SCROLL, EVENTID_SELECTSTART, EVENTID_SUBMIT, EVENTID_LAST diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index ed1fa2b..fc432d8 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1075,15 +1075,19 @@ static HRESULT WINAPI HTMLWindow2_get_onresize(IHTMLWindow2 *iface, VARIANT *p) static HRESULT WINAPI HTMLWindow2_put_onscroll(IHTMLWindow2 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_window_event(This, EVENTID_SCROLL, &v); } static HRESULT WINAPI HTMLWindow2_get_onscroll(IHTMLWindow2 *iface, VARIANT *p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_window_event(This, EVENTID_SCROLL, p); } static HRESULT WINAPI HTMLWindow2_get_document(IHTMLWindow2 *iface, IHTMLDocument2 **p)

1 0

Jacek Caban : mshtml: Added support for DISPATCH_METHOD|DISPATCH_PROPERTYGET flags in HTMLDocumentNode_invoke .
by Alexandre Julliard 10 Sep '12

10 Sep '12

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 10 Sep '12

10 Sep '12

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

Alexandre Julliard : winex11: Disable client-side rendering for OpenGL windows.
by Alexandre Julliard 10 Sep '12

10 Sep '12

Module: wine Branch: master Commit: a39659fcc969eb547686e309c9ca4c02b3de13fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a39659fcc969eb547686e309c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 10 16:16:05 2012 +0200 winex11: Disable client-side rendering for OpenGL windows. --- dlls/winex11.drv/opengl.c | 14 ++++++++++++++ dlls/winex11.drv/window.c | 1 + dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 9c1f6e5..d04791d 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1135,6 +1135,15 @@ static void release_gl_drawable( struct gl_drawable *gl ) if (gl) LeaveCriticalSection( &context_section ); } +BOOL has_gl_drawable( HWND hwnd ) +{ + struct gl_drawable *gl; + + gl = get_gl_drawable( hwnd, 0 ); + release_gl_drawable( gl ); + return gl != NULL; +} + static GLXContext create_glxcontext(Display *display, struct wgl_context *context, GLXContext shareList) { GLXContext ctx; @@ -3342,6 +3351,11 @@ BOOL set_win_format( HWND hwnd, XID fbconfig_id ) return FALSE; } +BOOL has_gl_drawable( HWND hwnd ) +{ + return FALSE; +} + void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_rect ) { } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 8774670..16034ea 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2051,6 +2051,7 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag if (!data->whole_window) return; if (swp_flags & SWP_HIDEWINDOW) return; if (data->whole_window == root_window) return; + if (has_gl_drawable( hwnd )) return; if (!client_side_graphics) return; surface_rect = get_surface_rect( visible_rect ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 73c89ee..1c4c341 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -558,6 +558,7 @@ extern Window X11DRV_get_whole_window( HWND hwnd ) DECLSPEC_HIDDEN; extern XIC X11DRV_get_ic( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL set_win_format( HWND hwnd, XID fbconfig_id ) DECLSPEC_HIDDEN; +extern BOOL has_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN; extern void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_rect ) DECLSPEC_HIDDEN; extern void destroy_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN;

1 0

Dmitry Timoshkov : windowscodecs: Add a bunch of tests for Graphic Control Extension metadata reader.
by Alexandre Julliard 10 Sep '12

10 Sep '12

Module: wine Branch: master Commit: 2b5739269cd3de922994f638591bae2b7405194f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5739269cd3de922994f6385… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 10 16:29:22 2012 +0900 windowscodecs: Add a bunch of tests for Graphic Control Extension metadata reader. --- dlls/windowscodecs/tests/metadata.c | 77 +++++++++++++++++++++++++++++++++++ include/wincodecsdk.idl | 2 + 2 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index fec283e..4bb33ae 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -1417,6 +1417,82 @@ todo_wine IStream_Release(stream); } +static void test_metadata_GCE(void) +{ + static const WCHAR GCE_name[] = {'G','r','a','p','h','i','c',' ','C','o','n','t','r','o','l',' ','E','x','t','e','n','s','i','o','n',' ','R','e','a','d','e','r',0}; + static const char GCE_data[] = "hello world!\xa\x2\x3\x4\x5\x6\x7\x8\xed\xa\xb\xc\xd\xe\xf"; + static const struct test_data td[5] = + { + { VT_UI1, 0, 0, { 2 }, NULL, { 'D','i','s','p','o','s','a','l',0 } }, + { VT_BOOL, 0, 0, { 1 }, NULL, { 'U','s','e','r','I','n','p','u','t','F','l','a','g',0 } }, + { VT_BOOL, 0, 0, { 0 }, NULL, { 'T','r','a','n','s','p','a','r','e','n','c','y','F','l','a','g',0 } }, + { VT_UI2, 0, 0, { 0x302 }, NULL, { 'D','e','l','a','y',0 } }, + { VT_UI1, 0, 0, { 4 }, NULL, { 'T','r','a','n','s','p','a','r','e','n','t','C','o','l','o','r','I','n','d','e','x',0 } } + }; + LARGE_INTEGER pos; + HRESULT hr; + IStream *stream; + IWICPersistStream *persist; + IWICMetadataReader *reader; + IWICMetadataHandlerInfo *info; + WCHAR name[64]; + UINT count, dummy; + GUID format; + CLSID id; + + hr = CoCreateInstance(&CLSID_WICGCEMetadataReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICMetadataReader, (void **)&reader); +todo_wine + ok(hr == S_OK || broken(hr == E_NOINTERFACE || hr == REGDB_E_CLASSNOTREG) /* before Win7 */, + "CoCreateInstance error %#x\n", hr); + + stream = create_stream(GCE_data, sizeof(GCE_data)); + + if (SUCCEEDED(hr)) + { + pos.QuadPart = 12; + hr = IStream_Seek(stream, pos, SEEK_SET, NULL); + ok(hr == S_OK, "IStream_Seek error %#x\n", hr); + + hr = IUnknown_QueryInterface(reader, &IID_IWICPersistStream, (void **)&persist); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + hr = IWICPersistStream_Load(persist, stream); + ok(hr == S_OK, "Load error %#x\n", hr); + + IWICPersistStream_Release(persist); + } + + if (SUCCEEDED(hr)) + { + 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_metadata(reader, td, count); + + hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + ok(hr == S_OK, "GetMetadataFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_MetadataFormatGCE), "wrong format %s\n", debugstr_guid(&format)); + + hr = IWICMetadataReader_GetMetadataHandlerInfo(reader, &info); + ok(hr == S_OK, "GetMetadataHandlerInfo error %#x\n", hr); + + hr = IWICMetadataHandlerInfo_GetCLSID(info, &id); + ok(hr == S_OK, "GetCLSID error %#x\n", hr); + ok(IsEqualGUID(&id, &CLSID_WICGCEMetadataReader), "wrong CLSID %s\n", debugstr_guid(&id)); + + hr = IWICMetadataHandlerInfo_GetFriendlyName(info, 64, name, &dummy); + ok(hr == S_OK, "GetFriendlyName error %#x\n", hr); + ok(lstrcmpW(name, GCE_name) == 0, "wrong GCE reader name %s\n", wine_dbgstr_w(name)); + + IWICMetadataHandlerInfo_Release(info); + IWICMetadataReader_Release(reader); + } + + IStream_Release(stream); +} + START_TEST(metadata) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -1430,6 +1506,7 @@ START_TEST(metadata) test_metadata_gif(); test_metadata_LSD(); test_metadata_IMD(); + test_metadata_GCE(); CoUninitialize(); } diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index ce7cf9f..2a5b389 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -61,6 +61,8 @@ cpp_quote("DEFINE_GUID(CLSID_WICLSDMetadataReader, 0x41070793,0x59e4,0x479a,0xa1 cpp_quote("DEFINE_GUID(CLSID_WICLSDMetadataWriter, 0x73c037e7,0xe5d9,0x4954,0x87,0x6a,0x6d,0xa8,0x1d,0x6e,0x57,0x68);") cpp_quote("DEFINE_GUID(CLSID_WICIMDMetadataReader, 0x7447a267,0x0015,0x42c8,0xa8,0xf1,0xfb,0x3b,0x94,0xc6,0x83,0x61);") cpp_quote("DEFINE_GUID(CLSID_WICIMDMetadataWriter, 0x8c89071f,0x452e,0x4e95,0x96,0x82,0x9d,0x10,0x24,0x62,0x71,0x72);") +cpp_quote("DEFINE_GUID(CLSID_WICGCEMetadataReader, 0xb92e345d,0xf52d,0x41f3,0xb5,0x62,0x08,0x1b,0xc7,0x72,0xe3,0xb9);") +cpp_quote("DEFINE_GUID(CLSID_WICGCEMetadataWriter, 0xaf95dc76,0x16b2,0x47f4,0xb3,0xea,0x3c,0x31,0x79,0x66,0x93,0xe7);") typedef struct WICMetadataPattern { ULARGE_INTEGER Position;

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2012