November 2010 - Wine-commits

Jacek Caban : mshtml: Added IOmNavigator::get_plugins implementation.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 00ee406ea6ec439dd0e9cf296caf3e7bc57b8f6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ee406ea6ec439dd0e9cf296… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 8 12:48:55 2010 +0100 mshtml: Added IOmNavigator::get_plugins implementation. --- dlls/mshtml/dispex.c | 2 + dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/omnavigator.c | 174 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/dom.c | 22 +++++ include/mshtml.idl | 22 +++++- 5 files changed, 219 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00ee406ea6ec439dd0e9c…

1 0

Jacek Caban : mshtml: Added IDispatchEx support to HTMLStyleSheetsCollection object.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 2da5890ea1ebaccce69e9b9fc8f2ac1d7c373584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2da5890ea1ebaccce69e9b9fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 8 12:48:44 2010 +0100 mshtml: Added IDispatchEx support to HTMLStyleSheetsCollection object. --- dlls/mshtml/dispex.c | 2 ++ dlls/mshtml/htmlstylesheet.c | 31 +++++++++++++++++++++---------- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 2 ++ include/mshtml.idl | 24 ++++++++++++++++++++++++ 5 files changed, 51 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index c63181f..b774917 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -109,6 +109,7 @@ static REFIID tid_ids[] = { &DIID_DispHTMLScriptElement, &DIID_DispHTMLSelectElement, &DIID_DispHTMLStyle, + &DIID_DispHTMLStyleSheetsCollection, &DIID_DispHTMLTable, &DIID_DispHTMLTableRow, &DIID_DispHTMLTextAreaElement, @@ -160,6 +161,7 @@ static REFIID tid_ids[] = { &IID_IHTMLStyle2, &IID_IHTMLStyle3, &IID_IHTMLStyle4, + &IID_IHTMLStyleSheetsCollection, &IID_IHTMLTable, &IID_IHTMLTableRow, &IID_IHTMLTextAreaElement, diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index e39bfb7..b54129a 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -41,6 +41,7 @@ struct HTMLStyleSheet { }; struct HTMLStyleSheetsCollection { + DispatchEx dispex; const IHTMLStyleSheetsCollectionVtbl *lpHTMLStyleSheetsCollectionVtbl; LONG ref; @@ -222,6 +223,8 @@ static HRESULT WINAPI HTMLStyleSheetsCollection_QueryInterface(IHTMLStyleSheetsC }else if(IsEqualGUID(&IID_IHTMLStyleSheetsCollection, riid)) { TRACE("(%p)->(IID_IHTMLStyleSheetsCollection %p)\n", This, ppv); *ppv = HTMLSTYLESHEETSCOL(This); + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; } if(*ppv) { @@ -263,25 +266,21 @@ static HRESULT WINAPI HTMLStyleSheetsCollection_GetTypeInfoCount(IHTMLStyleSheet UINT *pctinfo) { HTMLStyleSheetsCollection *This = HTMLSTYLESHEETSCOL_THIS(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->dispex), pctinfo); } static HRESULT WINAPI HTMLStyleSheetsCollection_GetTypeInfo(IHTMLStyleSheetsCollection *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLStyleSheetsCollection *This = HTMLSTYLESHEETSCOL_THIS(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLStyleSheetsCollection_GetIDsOfNames(IHTMLStyleSheetsCollection *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { HTMLStyleSheetsCollection *This = HTMLSTYLESHEETSCOL_THIS(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->dispex), riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLStyleSheetsCollection_Invoke(IHTMLStyleSheetsCollection *iface, @@ -289,9 +288,8 @@ static HRESULT WINAPI HTMLStyleSheetsCollection_Invoke(IHTMLStyleSheetsCollectio VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLStyleSheetsCollection *This = HTMLSTYLESHEETSCOL_THIS(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + return IDispatchEx_Invoke(DISPATCHEX(&This->dispex), dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLStyleSheetsCollection_get_length(IHTMLStyleSheetsCollection *iface, @@ -370,6 +368,17 @@ static const IHTMLStyleSheetsCollectionVtbl HTMLStyleSheetsCollectionVtbl = { HTMLStyleSheetsCollection_item }; +static const tid_t HTMLStyleSheetsCollection_iface_tids[] = { + IHTMLStyleSheetsCollection_tid, + 0 +}; +static dispex_static_data_t HTMLStyleSheetsCollection_dispex = { + NULL, + DispHTMLStyleSheetsCollection_tid, + NULL, + HTMLStyleSheetsCollection_iface_tids +}; + IHTMLStyleSheetsCollection *HTMLStyleSheetsCollection_Create(nsIDOMStyleSheetList *nslist) { HTMLStyleSheetsCollection *ret = heap_alloc(sizeof(HTMLStyleSheetsCollection)); @@ -381,6 +390,8 @@ IHTMLStyleSheetsCollection *HTMLStyleSheetsCollection_Create(nsIDOMStyleSheetLis nsIDOMStyleSheetList_AddRef(nslist); ret->nslist = nslist; + init_dispex(&ret->dispex, (IUnknown*)HTMLSTYLESHEETSCOL(ret), &HTMLStyleSheetsCollection_dispex); + return HTMLSTYLESHEETSCOL(ret); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index be11bd4..c222d3e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -91,6 +91,7 @@ typedef enum { DispHTMLScriptElement_tid, DispHTMLSelectElement_tid, DispHTMLStyle_tid, + DispHTMLStyleSheetsCollection_tid, DispHTMLTable_tid, DispHTMLTableRow_tid, DispHTMLTextAreaElement_tid, @@ -142,6 +143,7 @@ typedef enum { IHTMLStyle2_tid, IHTMLStyle3_tid, IHTMLStyle4_tid, + IHTMLStyleSheetsCollection_tid, IHTMLTable_tid, IHTMLTableRow_tid, IHTMLTextAreaElement_tid, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2134b31..c1110ba 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5850,6 +5850,8 @@ static void test_stylesheets(IHTMLDocument2 *doc) ok(hres == S_OK, "get_styleSheets failed: %08x\n", hres); ok(col != NULL, "col == NULL\n"); + test_disp2((IUnknown*)col, &DIID_DispHTMLStyleSheetsCollection, &IID_IHTMLStyleSheetsCollection, "[object]"); + hres = IHTMLStyleSheetsCollection_get_length(col, &len); ok(hres == S_OK, "get_length failed: %08x\n", hres); ok(len == 1, "len=%d\n", len); diff --git a/include/mshtml.idl b/include/mshtml.idl index 55740a7..a66aa74 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -6175,6 +6175,30 @@ interface IHTMLStyleSheetsCollection : IDispatch } /***************************************************************************** + * DispHTMLStyleSheetsCollection dispinterface + */ +[ + hidden, + uuid(3050f547-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLStyleSheetsCollection +{ +properties: +methods: + [propget, id(DISPID_IHTMLSTYLESHEETSCOLLECTION_LENGTH)] + long length(); + + [propget, id(DISPID_IHTMLSTYLESHEETSCOLLECTION__NEWENUM), hidden, restricted] + IUnknown *_newEnum(); + + [id(DISPID_IHTMLSTYLESHEETSCOLLECTION_ITEM)] + VARIANT item([in] VARIANT *pvarIndex); + + [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] + IDispatch *constructor(); +} + +/***************************************************************************** * IHTMLTxtRange interface */ [

1 0

Jacek Caban : mshtml: Use macro for tid declaration.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: c4d59250449750f87e253eb41d8dd5d65fef72ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4d59250449750f87e253eb41… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 8 12:49:07 2010 +0100 mshtml: Use macro for tid declaration. --- dlls/mshtml/dispex.c | 93 +-------------------- dlls/mshtml/mshtml_private.h | 184 ++++++++++++++++++++++-------------------- 2 files changed, 100 insertions(+), 177 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index b774917..17764d7 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -83,94 +83,11 @@ static ITypeInfo *typeinfos[LAST_tid]; static struct list dispex_data_list = LIST_INIT(dispex_data_list); static REFIID tid_ids[] = { - &IID_NULL, - &DIID_DispCEventObj, - &DIID_DispCPlugins, - &DIID_DispDOMChildrenCollection, - &DIID_DispHTMLAnchorElement, - &DIID_DispHTMLBody, - &DIID_DispHTMLCommentElement, - &DIID_DispHTMLCurrentStyle, - &DIID_DispHTMLDocument, - &DIID_DispHTMLDOMTextNode, - &DIID_DispHTMLElementCollection, - &DIID_DispHTMLEmbed, - &DIID_DispHTMLFormElement, - &DIID_DispHTMLGenericElement, - &DIID_DispHTMLFrameElement, - &DIID_DispHTMLIFrame, - &DIID_DispHTMLImg, - &DIID_DispHTMLInputElement, - &DIID_DispHTMLLocation, - &DIID_DispHTMLNavigator, - &DIID_DispHTMLObjectElement, - &DIID_DispHTMLOptionElement, - &DIID_DispHTMLScreen, - &DIID_DispHTMLScriptElement, - &DIID_DispHTMLSelectElement, - &DIID_DispHTMLStyle, - &DIID_DispHTMLStyleSheetsCollection, - &DIID_DispHTMLTable, - &DIID_DispHTMLTableRow, - &DIID_DispHTMLTextAreaElement, - &DIID_DispHTMLUnknownElement, - &DIID_DispHTMLWindow2, - &DIID_HTMLDocumentEvents, - &IID_IHTMLAnchorElement, - &IID_IHTMLBodyElement, - &IID_IHTMLBodyElement2, - &IID_IHTMLCommentElement, - &IID_IHTMLCurrentStyle, - &IID_IHTMLCurrentStyle2, - &IID_IHTMLCurrentStyle3, - &IID_IHTMLCurrentStyle4, - &IID_IHTMLDocument2, - &IID_IHTMLDocument3, - &IID_IHTMLDocument4, - &IID_IHTMLDocument5, - &IID_IHTMLDOMChildrenCollection, - &IID_IHTMLDOMNode, - &IID_IHTMLDOMNode2, - &IID_IHTMLDOMTextNode, - &IID_IHTMLElement, - &IID_IHTMLElement2, - &IID_IHTMLElement3, - &IID_IHTMLElement4, - &IID_IHTMLElementCollection, - &IID_IHTMLEmbedElement, - &IID_IHTMLEventObj, - &IID_IHTMLFiltersCollection, - &IID_IHTMLFormElement, - &IID_IHTMLFrameBase, - &IID_IHTMLFrameBase2, - &IID_IHTMLGenericElement, - &IID_IHTMLFrameElement3, - &IID_IHTMLIFrameElement, - &IID_IHTMLImageElementFactory, - &IID_IHTMLImgElement, - &IID_IHTMLInputElement, - &IID_IHTMLLocation, - &IID_IHTMLObjectElement, - &IID_IHTMLOptionElement, - &IID_IHTMLPluginsCollection, - &IID_IHTMLRect, - &IID_IHTMLScreen, - &IID_IHTMLScriptElement, - &IID_IHTMLSelectElement, - &IID_IHTMLStyle, - &IID_IHTMLStyle2, - &IID_IHTMLStyle3, - &IID_IHTMLStyle4, - &IID_IHTMLStyleSheetsCollection, - &IID_IHTMLTable, - &IID_IHTMLTableRow, - &IID_IHTMLTextAreaElement, - &IID_IHTMLTextContainer, - &IID_IHTMLUniqueName, - &IID_IHTMLWindow2, - &IID_IHTMLWindow3, - &IID_IHTMLWindow4, - &IID_IOmNavigator +#define XIID(iface) &IID_ ## iface, +#define XDIID(iface) &DIID_ ## iface, +TID_LIST +#undef XIID +#undef XDIID }; static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c222d3e..d9dd563 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -63,96 +63,102 @@ typedef struct ConnectionPoint ConnectionPoint; typedef struct BSCallback BSCallback; typedef struct event_target_t event_target_t; -/* NOTE: make sure to keep in sync with dispex.c */ +#define TID_LIST \ + XIID(NULL) \ + XDIID(DispCEventObj) \ + XDIID(DispCPlugins) \ + XDIID(DispDOMChildrenCollection) \ + XDIID(DispHTMLAnchorElement) \ + XDIID(DispHTMLBody) \ + XDIID(DispHTMLCommentElement) \ + XDIID(DispHTMLCurrentStyle) \ + XDIID(DispHTMLDocument) \ + XDIID(DispHTMLDOMTextNode) \ + XDIID(DispHTMLElementCollection) \ + XDIID(DispHTMLEmbed) \ + XDIID(DispHTMLFormElement) \ + XDIID(DispHTMLGenericElement) \ + XDIID(DispHTMLFrameElement) \ + XDIID(DispHTMLIFrame) \ + XDIID(DispHTMLImg) \ + XDIID(DispHTMLInputElement) \ + XDIID(DispHTMLLocation) \ + XDIID(DispHTMLNavigator) \ + XDIID(DispHTMLObjectElement) \ + XDIID(DispHTMLOptionElement) \ + XDIID(DispHTMLScreen) \ + XDIID(DispHTMLScriptElement) \ + XDIID(DispHTMLSelectElement) \ + XDIID(DispHTMLStyle) \ + XDIID(DispHTMLStyleSheetsCollection) \ + XDIID(DispHTMLTable) \ + XDIID(DispHTMLTableRow) \ + XDIID(DispHTMLTextAreaElement) \ + XDIID(DispHTMLUnknownElement) \ + XDIID(DispHTMLWindow2) \ + XDIID(HTMLDocumentEvents) \ + XIID(IHTMLAnchorElement) \ + XIID(IHTMLBodyElement) \ + XIID(IHTMLBodyElement2) \ + XIID(IHTMLCommentElement) \ + XIID(IHTMLCurrentStyle) \ + XIID(IHTMLCurrentStyle2) \ + XIID(IHTMLCurrentStyle3) \ + XIID(IHTMLCurrentStyle4) \ + XIID(IHTMLDocument2) \ + XIID(IHTMLDocument3) \ + XIID(IHTMLDocument4) \ + XIID(IHTMLDocument5) \ + XIID(IHTMLDOMChildrenCollection) \ + XIID(IHTMLDOMNode) \ + XIID(IHTMLDOMNode2) \ + XIID(IHTMLDOMTextNode) \ + XIID(IHTMLElement) \ + XIID(IHTMLElement2) \ + XIID(IHTMLElement3) \ + XIID(IHTMLElement4) \ + XIID(IHTMLElementCollection) \ + XIID(IHTMLEmbedElement) \ + XIID(IHTMLEventObj) \ + XIID(IHTMLFiltersCollection) \ + XIID(IHTMLFormElement) \ + XIID(IHTMLFrameBase) \ + XIID(IHTMLFrameBase2) \ + XIID(IHTMLFrameElement3) \ + XIID(IHTMLGenericElement) \ + XIID(IHTMLIFrameElement) \ + XIID(IHTMLImageElementFactory) \ + XIID(IHTMLImgElement) \ + XIID(IHTMLInputElement) \ + XIID(IHTMLLocation) \ + XIID(IHTMLObjectElement) \ + XIID(IHTMLOptionElement) \ + XIID(IHTMLPluginsCollection) \ + XIID(IHTMLRect) \ + XIID(IHTMLScreen) \ + XIID(IHTMLScriptElement) \ + XIID(IHTMLSelectElement) \ + XIID(IHTMLStyle) \ + XIID(IHTMLStyle2) \ + XIID(IHTMLStyle3) \ + XIID(IHTMLStyle4) \ + XIID(IHTMLStyleSheetsCollection) \ + XIID(IHTMLTable) \ + XIID(IHTMLTableRow) \ + XIID(IHTMLTextAreaElement) \ + XIID(IHTMLTextContainer) \ + XIID(IHTMLUniqueName) \ + XIID(IHTMLWindow2) \ + XIID(IHTMLWindow3) \ + XIID(IHTMLWindow4) \ + XIID(IOmNavigator) + typedef enum { - NULL_tid, - DispCEventObj_tid, - DispCPlugins_tid, - DispDOMChildrenCollection_tid, - DispHTMLAnchorElement_tid, - DispHTMLBody_tid, - DispHTMLCommentElement_tid, - DispHTMLCurrentStyle_tid, - DispHTMLDocument_tid, - DispHTMLDOMTextNode_tid, - DispHTMLElementCollection_tid, - DispHTMLEmbed_tid, - DispHTMLFormElement_tid, - DispHTMLGenericElement_tid, - DispHTMLFrameElement_tid, - DispHTMLIFrame_tid, - DispHTMLImg_tid, - DispHTMLInputElement_tid, - DispHTMLLocation_tid, - DispHTMLNavigator_tid, - DispHTMLObjectElement_tid, - DispHTMLOptionElement_tid, - DispHTMLScreen_tid, - DispHTMLScriptElement_tid, - DispHTMLSelectElement_tid, - DispHTMLStyle_tid, - DispHTMLStyleSheetsCollection_tid, - DispHTMLTable_tid, - DispHTMLTableRow_tid, - DispHTMLTextAreaElement_tid, - DispHTMLUnknownElement_tid, - DispHTMLWindow2_tid, - HTMLDocumentEvents_tid, - IHTMLAnchorElement_tid, - IHTMLBodyElement_tid, - IHTMLBodyElement2_tid, - IHTMLCommentElement_tid, - IHTMLCurrentStyle_tid, - IHTMLCurrentStyle2_tid, - IHTMLCurrentStyle3_tid, - IHTMLCurrentStyle4_tid, - IHTMLDocument2_tid, - IHTMLDocument3_tid, - IHTMLDocument4_tid, - IHTMLDocument5_tid, - IHTMLDOMChildrenCollection_tid, - IHTMLDOMNode_tid, - IHTMLDOMNode2_tid, - IHTMLDOMTextNode_tid, - IHTMLElement_tid, - IHTMLElement2_tid, - IHTMLElement3_tid, - IHTMLElement4_tid, - IHTMLElementCollection_tid, - IHTMLEmbedElement_tid, - IHTMLEventObj_tid, - IHTMLFiltersCollection_tid, - IHTMLFormElement_tid, - IHTMLFrameBase_tid, - IHTMLFrameBase2_tid, - IHTMLFrameElement3_tid, - IHTMLGenericElement_tid, - IHTMLIFrameElement_tid, - IHTMLImageElementFactory_tid, - IHTMLImgElement_tid, - IHTMLInputElement_tid, - IHTMLLocation_tid, - IHTMLObjectElement_tid, - IHTMLOptionElement_tid, - IHTMLPluginsCollection_tid, - IHTMLRect_tid, - IHTMLScreen_tid, - IHTMLScriptElement_tid, - IHTMLSelectElement_tid, - IHTMLStyle_tid, - IHTMLStyle2_tid, - IHTMLStyle3_tid, - IHTMLStyle4_tid, - IHTMLStyleSheetsCollection_tid, - IHTMLTable_tid, - IHTMLTableRow_tid, - IHTMLTextAreaElement_tid, - IHTMLTextContainer_tid, - IHTMLUniqueName_tid, - IHTMLWindow2_tid, - IHTMLWindow3_tid, - IHTMLWindow4_tid, - IOmNavigator_tid, +#define XIID(iface) iface ## _tid, +#define XDIID(iface) iface ## _tid, +TID_LIST +#undef XIID +#undef XDIID LAST_tid } tid_t;

1 0

Alexandre Julliard : winex11: Add support for receiving ConfigureNotify events on non-toplevel windows.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 9bce7fcb879e53e9c13b77ed4d7a0c885c4c0be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bce7fcb879e53e9c13b77ed4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 8 15:20:51 2010 +0100 winex11: Add support for receiving ConfigureNotify events on non-toplevel windows. --- dlls/winex11.drv/event.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 7ff6cd3..a72a3cb 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -818,6 +818,8 @@ static BOOL is_net_wm_state_maximized( Display *display, struct x11drv_win_data int format, ret = 0; unsigned long i, count, remaining; + if (!data->whole_window) return FALSE; + wine_tsx11_lock(); if (!XGetWindowProperty( display, data->whole_window, x11drv_atom(_NET_WM_STATE), 0, 65536/sizeof(CARD32), False, XA_ATOM, &type, &format, &count, @@ -872,6 +874,8 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) struct x11drv_win_data *data; RECT rect; UINT flags; + HWND parent; + BOOL root_coords; int cx, cy, x = event->x, y = event->y; if (!hwnd) return; @@ -887,23 +891,26 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) /* Get geometry */ - if (!event->send_event) /* normal event, need to map coordinates to the root */ + parent = GetAncestor( hwnd, GA_PARENT ); + root_coords = event->send_event; /* synthetic events are always in root coords */ + + if (!root_coords && parent == GetDesktopWindow()) /* normal event, map coordinates to the root */ { Window child; wine_tsx11_lock(); - XTranslateCoordinates( event->display, data->whole_window, root_window, + XTranslateCoordinates( event->display, event->window, root_window, 0, 0, &x, &y, &child ); wine_tsx11_unlock(); + root_coords = TRUE; } rect.left = x; rect.top = y; rect.right = x + event->width; rect.bottom = y + event->height; - OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); + if (root_coords) OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); TRACE( "win %p/%lx new X rect %d,%d,%dx%d (event %d,%d,%dx%d)\n", hwnd, data->whole_window, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, event->x, event->y, event->width, event->height ); - X11DRV_X_to_window_rect( data, &rect ); if (is_net_wm_state_maximized( event->display, data )) { @@ -924,6 +931,9 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) } } + X11DRV_X_to_window_rect( data, &rect ); + if (root_coords) MapWindowPoints( 0, parent, (POINT *)&rect, 2 ); + /* Compare what has changed */ x = rect.left;

1 0

Alexandre Julliard : winex11: Handle GravityNotify events for non-toplevel windows.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: a8063e8b8bf586f79d97eeeab71411b5c0389da6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8063e8b8bf586f79d97eeeab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 8 15:22:09 2010 +0100 winex11: Handle GravityNotify events for non-toplevel windows. --- dlls/winex11.drv/event.c | 33 +++++++++++++++++++++++++++++++-- dlls/winex11.drv/window.c | 2 +- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index a72a3cb..aa38179 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -95,6 +95,7 @@ static void X11DRV_ReparentNotify( HWND hwnd, XEvent *event ); static void X11DRV_ConfigureNotify( HWND hwnd, XEvent *event ); static void X11DRV_PropertyNotify( HWND hwnd, XEvent *event ); static void X11DRV_ClientMessage( HWND hwnd, XEvent *event ); +static void X11DRV_GravityNotify( HWND hwnd, XEvent *event ); struct event_handler { @@ -129,7 +130,7 @@ static struct event_handler handlers[MAX_EVENT_HANDLERS] = { ReparentNotify, X11DRV_ReparentNotify }, { ConfigureNotify, X11DRV_ConfigureNotify }, /* ConfigureRequest */ - /* GravityNotify */ + { GravityNotify, X11DRV_GravityNotify }, /* ResizeRequest */ /* CirculateNotify */ /* CirculateRequest */ @@ -142,7 +143,7 @@ static struct event_handler handlers[MAX_EVENT_HANDLERS] = { MappingNotify, X11DRV_MappingNotify }, }; -static int nb_event_handlers = 19; /* change this if you add handlers above */ +static int nb_event_handlers = 20; /* change this if you add handlers above */ /* return the name of an X event */ @@ -963,6 +964,34 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) } +/********************************************************************** + * X11DRV_GravityNotify + */ +static void X11DRV_GravityNotify( HWND hwnd, XEvent *xev ) +{ + XGravityEvent *event = &xev->xgravity; + struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); + RECT rect; + + if (!data) return; + + rect.left = event->x; + rect.top = event->y; + rect.right = rect.left + data->whole_rect.right - data->whole_rect.left; + rect.bottom = rect.top + data->whole_rect.bottom - data->whole_rect.top; + + TRACE( "win %p/%lx new X rect %d,%d,%dx%d (event %d,%d)\n", + hwnd, data->whole_window, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, + event->x, event->y ); + + X11DRV_X_to_window_rect( data, &rect ); + + if (data->window_rect.left != rect.left || data ->window_rect.top != rect.top) + SetWindowPos( hwnd, 0, rect.left, rect.top, 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOCOPYBITS ); +} + + /*********************************************************************** * get_window_wm_state */ diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7e96a39..1005ad2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2371,7 +2371,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags if (thread_data->current_event && thread_data->current_event->xany.window == data->whole_window) event_type = thread_data->current_event->type; - if (event_type != ConfigureNotify && event_type != PropertyNotify) + if (event_type != ConfigureNotify && event_type != PropertyNotify && event_type != GravityNotify) event_type = 0; /* ignore other events */ if (data->mapped)

1 0

Maarten Lankhorst : quartz: Add IQualityControl to video renderer.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: b6fd7bc133158f8da13df35586df404433b0907f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6fd7bc133158f8da13df3558… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 5 23:19:13 2010 +0100 quartz: Add IQualityControl to video renderer. --- dlls/quartz/tests/videorenderer.c | 4 ++-- dlls/quartz/videorenderer.c | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 967abd4..860b30d 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -70,6 +70,8 @@ static void test_query_interface(void) RELEASE_EXPECT(pBasicVideo, 1); QI_SUCCEED(pVideoRenderer, IID_IMediaSeeking, pMediaSeeking); RELEASE_EXPECT(pMediaSeeking, 1); + QI_SUCCEED(pVideoRenderer, IID_IQualityControl, pQualityControl); + RELEASE_EXPECT(pQualityControl, 1); todo_wine { QI_SUCCEED(pVideoRenderer, IID_IDirectDrawVideo, pDirectDrawVideo); RELEASE_EXPECT(pDirectDrawVideo, 1); @@ -77,8 +79,6 @@ static void test_query_interface(void) RELEASE_EXPECT(pKsPropertySet, 1); QI_SUCCEED(pVideoRenderer, IID_IMediaPosition, pMediaPosition); RELEASE_EXPECT(pMediaPosition, 1); - QI_SUCCEED(pVideoRenderer, IID_IQualityControl, pQualityControl); - RELEASE_EXPECT(pQualityControl, 1); QI_SUCCEED(pVideoRenderer, IID_IQualProp, pQualProp); RELEASE_EXPECT(pQualProp, 1); } diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 3a35f38..e135fb9 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -53,6 +53,13 @@ static const IBasicVideoVtbl IBasicVideo_VTable; static const IVideoWindowVtbl IVideoWindow_VTable; static const IPinVtbl VideoRenderer_InputPin_Vtbl; static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl; +static const IQualityControlVtbl VideoRenderer_QualityControl_Vtbl = { + QualityControlImpl_QueryInterface, + QualityControlImpl_AddRef, + QualityControlImpl_Release, + QualityControlImpl_Notify, + QualityControlImpl_SetSink +}; typedef struct VideoRendererImpl { @@ -62,6 +69,7 @@ typedef struct VideoRendererImpl const IUnknownVtbl * IInner_vtbl; const IAMFilterMiscFlagsVtbl *IAMFilterMiscFlags_vtbl; IUnknown *seekthru_unk; + QualityControlImpl qcimpl; BaseInputPin *pInputPin; @@ -622,6 +630,9 @@ HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) if (FAILED(hr)) goto fail; + QualityControlImpl_init(&pVideoRenderer->qcimpl, (IPin*)pVideoRenderer->pInputPin, (IBaseFilter*)pVideoRenderer); + pVideoRenderer->qcimpl.lpVtbl = &VideoRenderer_QualityControl_Vtbl; + if (!CreateRenderingSubsystem(pVideoRenderer)) return E_FAIL; @@ -671,6 +682,8 @@ static HRESULT WINAPI VideoRendererInner_QueryInterface(IUnknown * iface, REFIID return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) *ppv = &This->IAMFilterMiscFlags_vtbl; + else if (IsEqualIID(riid, &IID_IQualityControl)) + *ppv = &This->qcimpl; if (*ppv) {

1 0

Maarten Lankhorst : strmbase: Add support for IQualityControl to transform filter.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 5955a349c6c3196374fd118eb6ccb7a5d63b12a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5955a349c6c3196374fd118eb… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 5 23:19:14 2010 +0100 strmbase: Add support for IQualityControl to transform filter. --- dlls/strmbase/transform.c | 28 ++++++++++++++++++++++++++++ include/wine/strmbase.h | 3 +++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index e17620c..029d289 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -44,6 +44,7 @@ static const WCHAR wcsOutputPinName[] = {'o','u','t','p','u','t',' ','p','i','n' static const IBaseFilterVtbl TransformFilter_Vtbl; static const IPinVtbl TransformFilter_InputPin_Vtbl; static const IPinVtbl TransformFilter_OutputPin_Vtbl; +static const IQualityControlVtbl TransformFilter_QualityControl_Vtbl; static HRESULT WINAPI TransformFilter_Input_CheckMediaType(BasePin *iface, const AM_MEDIA_TYPE * pmt) { @@ -198,6 +199,10 @@ static HRESULT TransformFilter_Init(const IBaseFilterVtbl *pVtbl, const CLSID* p if (FAILED(hr)) ERR("Cannot create output pin (%x)\n", hr); + else { + QualityControlImpl_init(&pTransformFilter->qcimpl, (IPin*)pTransformFilter->ppPins[0], (IBaseFilter*)pTransformFilter); + pTransformFilter->qcimpl.lpVtbl = &TransformFilter_QualityControl_Vtbl; + } } if (FAILED(hr)) { @@ -238,6 +243,11 @@ HRESULT WINAPI TransformFilterImpl_QueryInterface(IBaseFilter * iface, REFIID ri TransformFilter *This = (TransformFilter *)iface; TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppv); + if (IsEqualIID(riid, &IID_IQualityControl)) { + *ppv = (IQualityControl*)&This->qcimpl; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } hr = BaseFilterImpl_QueryInterface(iface, riid, ppv); if (FAILED(hr) && (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow))) @@ -547,3 +557,21 @@ static const IPinVtbl TransformFilter_OutputPin_Vtbl = BaseOutputPinImpl_EndFlush, BasePinImpl_NewSegment }; + +HRESULT WINAPI TransformFilter_QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { + QualityControlImpl *qc = (QualityControlImpl*)iface; + TransformFilter *This = (TransformFilter *)qc->self; + + if (This->pFuncsTable->pfnNotify) + return This->pFuncsTable->pfnNotify(This, sender, qm); + else + return QualityControlImpl_Notify(iface, sender, qm); +} + +static const IQualityControlVtbl TransformFilter_QualityControl_Vtbl = { + QualityControlImpl_QueryInterface, + QualityControlImpl_AddRef, + QualityControlImpl_Release, + TransformFilter_QualityControlImpl_Notify, + QualityControlImpl_SetSink +}; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index b748930..bbb1363 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -219,6 +219,7 @@ typedef struct TransformFilter AM_MEDIA_TYPE pmt; const struct TransformFilterFuncTable * pFuncsTable; + QualityControlImpl qcimpl; } TransformFilter; typedef HRESULT (WINAPI *TransformFilter_DecideBufferSize) (TransformFilter *iface, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest); @@ -234,6 +235,7 @@ typedef HRESULT (WINAPI *TransformFilter_BeginFlush) (TransformFilter *iface); typedef HRESULT (WINAPI *TransformFilter_EndFlush) (TransformFilter *iface); typedef HRESULT (WINAPI *TransformFilter_NewSegment) (TransformFilter *iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate); +typedef HRESULT (WINAPI *TransformFilter_Notify) (TransformFilter *iface, IBaseFilter *sender, Quality qm); typedef struct TransformFilterFuncTable { /* Required */ @@ -250,6 +252,7 @@ typedef struct TransformFilterFuncTable { TransformFilter_BeginFlush pfnBeginFlush; TransformFilter_EndFlush pfnEndFlush; TransformFilter_NewSegment pfnNewSegment; + TransformFilter_Notify pfnNotify; } TransformFilterFuncTable; HRESULT WINAPI TransformFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv);

1 0

Henri Verbeet : wined3d: Move the fullscreen window setup / restore code to the device.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 45cee64295e00681dabb0343e89b3727f8e8da70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45cee64295e00681dabb0343e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 8 11:50:31 2010 +0100 wined3d: Move the fullscreen window setup / restore code to the device. --- dlls/wined3d/device.c | 91 ++++++++++++++++++++++++++++++++++++++- dlls/wined3d/swapchain.c | 91 +--------------------------------------- dlls/wined3d/wined3d_private.h | 4 +- 3 files changed, 92 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45cee64295e00681dabb0…

1 0

Henri Verbeet : wined3d: Do not activate the window when restoring the styles.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: b898130a114f1baf24f717ab0c5f9a65030c5283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b898130a114f1baf24f717ab0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 8 11:50:32 2010 +0100 wined3d: Do not activate the window when restoring the styles. This is consistent with device_setup_fullscreen_window(), and ddraw actually has a test for this in ddrawmodes.c. (Although it doesn't actually use device_setup_fullscreen_window() until the next patch.) --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7b5737d..8030bc3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1824,7 +1824,7 @@ void device_restore_fullscreen_window(IWineD3DDeviceImpl *device, HWND window) SetWindowLongW(window, GWL_STYLE, device->style); SetWindowLongW(window, GWL_EXSTYLE, device->exStyle); } - SetWindowPos(window, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER); + SetWindowPos(window, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); device->filter_messages = filter_messages;

1 0

Henri Verbeet : ddraw: Setup the device window in SetCooperativeLevel().
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 7e3985e1fea60da73bae2b9465b94e5d110909fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e3985e1fea60da73bae2b946… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 8 11:50:33 2010 +0100 ddraw: Setup the device window in SetCooperativeLevel(). --- dlls/d3d8/device.c | 9 ++++++++- dlls/d3d9/device.c | 26 ++++++++++++++++++-------- dlls/ddraw/ddraw.c | 37 +++++++++++++++++++++++-------------- dlls/ddraw/tests/d3d.c | 3 +++ dlls/ddraw/tests/ddrawmodes.c | 2 +- dlls/wined3d/device.c | 14 +++++++++----- dlls/wined3d/swapchain.c | 7 ------- dlls/wined3d/wined3d_private.h | 2 -- include/wine/wined3d.idl | 8 ++++++++ 9 files changed, 70 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e3985e1fea60da73bae2…

1 0