February 2011 - Wine-Commits

Dmitry Timoshkov : gdi32: Use graphics mode specified at the EMF creation time when playing EMR_EXTTEXTOUT record .
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: 9bc5946cdedda3925f958667683d092f2ed4ea2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bc5946cdedda3925f9586676… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Feb 24 18:19:56 2011 +0800 gdi32: Use graphics mode specified at the EMF creation time when playing EMR_EXTTEXTOUT record. --- dlls/gdi32/enhmetafile.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 15f7c1b..b8863fd 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1133,6 +1133,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( const EMREXTTEXTOUTA *pExtTextOutA = (const EMREXTTEXTOUTA *)mr; RECT rc; const INT *dx = NULL; + int old_mode; rc.left = pExtTextOutA->emrtext.rcl.left; rc.top = pExtTextOutA->emrtext.rcl.top; @@ -1142,6 +1143,11 @@ BOOL WINAPI PlayEnhMetaFileRecord( pExtTextOutA->emrtext.ptlReference.x, pExtTextOutA->emrtext.ptlReference.y, rc.left, rc.top, rc.right, rc.bottom, pExtTextOutA->emrtext.fOptions); + old_mode = SetGraphicsMode(hdc, pExtTextOutA->iGraphicsMode); + /* Reselect the font back into the dc so that the transformation + gets updated. */ + SelectObject(hdc, GetCurrentObject(hdc, OBJ_FONT)); + /* Linux version of pstoedit produces EMFs with offDx set to 0. * These files can be enumerated and played under Win98 just * fine, but at least Win2k chokes on them. @@ -1153,6 +1159,8 @@ BOOL WINAPI PlayEnhMetaFileRecord( pExtTextOutA->emrtext.fOptions, &rc, (LPCSTR)((const BYTE *)mr + pExtTextOutA->emrtext.offString), pExtTextOutA->emrtext.nChars, dx); + + SetGraphicsMode(hdc, old_mode); break; } @@ -1161,6 +1169,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( const EMREXTTEXTOUTW *pExtTextOutW = (const EMREXTTEXTOUTW *)mr; RECT rc; const INT *dx = NULL; + int old_mode; rc.left = pExtTextOutW->emrtext.rcl.left; rc.top = pExtTextOutW->emrtext.rcl.top; @@ -1170,6 +1179,11 @@ BOOL WINAPI PlayEnhMetaFileRecord( pExtTextOutW->emrtext.ptlReference.x, pExtTextOutW->emrtext.ptlReference.y, rc.left, rc.top, rc.right, rc.bottom, pExtTextOutW->emrtext.fOptions); + old_mode = SetGraphicsMode(hdc, pExtTextOutW->iGraphicsMode); + /* Reselect the font back into the dc so that the transformation + gets updated. */ + SelectObject(hdc, GetCurrentObject(hdc, OBJ_FONT)); + /* Linux version of pstoedit produces EMFs with offDx set to 0. * These files can be enumerated and played under Win98 just * fine, but at least Win2k chokes on them. @@ -1181,6 +1195,8 @@ BOOL WINAPI PlayEnhMetaFileRecord( pExtTextOutW->emrtext.fOptions, &rc, (LPCWSTR)((const BYTE *)mr + pExtTextOutW->emrtext.offString), pExtTextOutW->emrtext.nChars, dx); + + SetGraphicsMode(hdc, old_mode); break; }

1 0

Huw Davies : oleaut32: Mask off the lsb from the vtbl offset. This is set when the user specifies an offset in ICreateTypeInfo.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: 060c8daf7facf6947e2b52e06a7d2ce771ba77b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=060c8daf7facf6947e2b52e06… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 24 09:42:58 2011 +0000 oleaut32: Mask off the lsb from the vtbl offset. This is set when the user specifies an offset in ICreateTypeInfo. --- dlls/oleaut32/typelib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index cc3497e..f101ead 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1987,7 +1987,7 @@ MSFT_DoFuncs(TLBContext* pcx, (*pptfd)->funcdesc.callconv = (pFuncRec->FKCCIC) >> 8 & 0xF; (*pptfd)->funcdesc.cParams = pFuncRec->nrargs ; (*pptfd)->funcdesc.cParamsOpt = pFuncRec->nroargs ; - (*pptfd)->funcdesc.oVft = pFuncRec->VtableOffset; + (*pptfd)->funcdesc.oVft = pFuncRec->VtableOffset & ~1; (*pptfd)->funcdesc.wFuncFlags = LOWORD(pFuncRec->Flags) ; MSFT_GetTdesc(pcx, @@ -3552,7 +3552,7 @@ static void SLTG_DoFuncs(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, (*ppFuncDesc)->funcdesc.callconv = pFunc->nacc & 0x7; (*ppFuncDesc)->funcdesc.cParams = pFunc->nacc >> 3; (*ppFuncDesc)->funcdesc.cParamsOpt = (pFunc->retnextopt & 0x7e) >> 1; - (*ppFuncDesc)->funcdesc.oVft = pFunc->vtblpos; + (*ppFuncDesc)->funcdesc.oVft = pFunc->vtblpos & ~1; if(pFunc->magic & SLTG_FUNCTION_FLAGS_PRESENT) (*ppFuncDesc)->funcdesc.wFuncFlags = pFunc->funcflags;

1 0

Michael Stefaniuc : msxml3: COM cleanup for the IDispatchEx iface.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: 16c543a089f6808878efca35bbf0b898d8beef46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16c543a089f6808878efca35b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 23 23:15:47 2011 +0100 msxml3: COM cleanup for the IDispatchEx iface. --- dlls/msxml3/dispex.c | 14 ++++++-------- dlls/msxml3/msxml_private.h | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 1b8afb5..392d856 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -40,8 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); -#define DISPATCHEX(x) ((IDispatchEx*) &(x)->lpIDispatchExVtbl) - typedef struct { DISPID id; BSTR name; @@ -306,7 +304,7 @@ static inline BOOL is_dynamic_dispid(DISPID id) static inline DispatchEx *impl_from_IDispatchEx(IDispatchEx *iface) { - return (DispatchEx*)((char*)iface - FIELD_OFFSET(DispatchEx, lpIDispatchExVtbl)); + return CONTAINING_RECORD(iface, DispatchEx, IDispatchEx_iface); } static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) @@ -362,7 +360,7 @@ static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, lcid, rgDispId); for(i=0; i < cNames; i++) { - hres = IDispatchEx_GetDispID(DISPATCHEX(This), rgszNames[i], 0, rgDispId+i); + hres = IDispatchEx_GetDispID(&This->IDispatchEx_iface, rgszNames[i], 0, rgDispId+i); if(FAILED(hres)) return hres; } @@ -379,7 +377,7 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return IDispatchEx_InvokeEx(DISPATCHEX(This), dispIdMember, lcid, wFlags, + return IDispatchEx_InvokeEx(&This->IDispatchEx_iface, dispIdMember, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, NULL); } @@ -630,10 +628,10 @@ BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv) if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); - *ppv = DISPATCHEX(This); + *ppv = &This->IDispatchEx_iface; }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); - *ppv = DISPATCHEX(This); + *ppv = &This->IDispatchEx_iface; }else if(IsEqualGUID(&IID_UndocumentedScriptIface, riid)) { TRACE("(%p)->(IID_UndocumentedScriptIface %p) returning NULL\n", This, ppv); *ppv = NULL; @@ -651,7 +649,7 @@ BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv) void init_dispex(DispatchEx *dispex, IUnknown *outer, dispex_static_data_t *data) { - dispex->lpIDispatchExVtbl = &DispatchExVtbl; + dispex->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; dispex->outer = outer; dispex->data = data; } diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 65e10bf..2687324 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -144,7 +144,7 @@ typedef struct { } dispex_static_data_t; typedef struct { - const IDispatchExVtbl *lpIDispatchExVtbl; + IDispatchEx IDispatchEx_iface; IUnknown *outer;

1 0

Vincent Povirk : msvcrt: Try to call CorExitProcess instead of ExitProcess on exit.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: 71bfd33463e24de24ea4a94e47ce01946ad37a25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71bfd33463e24de24ea4a94e4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Feb 21 15:49:59 2011 -0600 msvcrt: Try to call CorExitProcess instead of ExitProcess on exit. --- dlls/msvcrt/exit.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 6e5a58a..d7f28f1 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -265,8 +265,23 @@ MSVCRT__onexit_t CDECL MSVCRT__onexit(MSVCRT__onexit_t func) */ void CDECL MSVCRT_exit(int exitcode) { + HMODULE hmscoree; + static const WCHAR mscoreeW[] = {'m','s','c','o','r','e','e',0}; + void WINAPI (*pCorExitProcess)(int); + TRACE("(%d)\n",exitcode); MSVCRT__cexit(); + + hmscoree = GetModuleHandleW(mscoreeW); + + if (hmscoree) + { + pCorExitProcess = (void*)GetProcAddress(hmscoree, "CorExitProcess"); + + if (pCorExitProcess) + pCorExitProcess(exitcode); + } + ExitProcess(exitcode); }

1 0

Nikolay Sivov : msxml3: Remove transformNode() forward.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: bf01d1b3d73d57f06364d0cec0151f7bc83aa721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf01d1b3d73d57f06364d0cec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 23 15:03:42 2011 +0300 msxml3: Remove transformNode() forward. --- dlls/msxml3/attribute.c | 5 ++- dlls/msxml3/cdata.c | 5 ++- dlls/msxml3/comment.c | 5 ++- dlls/msxml3/docfrag.c | 5 ++- dlls/msxml3/domdoc.c | 7 ++-- dlls/msxml3/element.c | 5 ++- dlls/msxml3/entityref.c | 5 ++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 67 +++++++++++++++++------------------------- dlls/msxml3/pi.c | 5 ++- dlls/msxml3/text.c | 5 ++- 11 files changed, 56 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf01d1b3d73d57f06364d…

1 0

Nikolay Sivov : msxml3: Get rid of not longer used internal IXMLDOMNode vtable.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: 4735c5193fdc759c89f0a74b895caab8a2042ab4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4735c5193fdc759c89f0a74b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 23 15:13:36 2011 +0300 msxml3: Get rid of not longer used internal IXMLDOMNode vtable. --- dlls/msxml3/msxml_private.h | 1 - dlls/msxml3/node.c | 59 ++++-------------------------------------- 2 files changed, 6 insertions(+), 54 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 59ad33b..ab7820f 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -234,7 +234,6 @@ extern void set_xpathmode(xmlDocPtr doc, BOOL xpath); typedef struct _xmlnode { DispatchEx dispex; - IXMLDOMNode IXMLDOMNode_iface; IXMLDOMNode *iface; xmlNodePtr node; } xmlnode; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 26b648c..a952ac0 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -128,11 +128,6 @@ xmlnode *get_node_obj(IXMLDOMNode *node) return SUCCEEDED(hres) ? obj : NULL; } -static inline xmlnode *impl_from_IXMLDOMNode( IXMLDOMNode *iface ) -{ - return CONTAINING_RECORD(iface, xmlnode, IXMLDOMNode_iface); -} - HRESULT node_get_nodeName(xmlnode *This, BSTR *name) { if (!name) @@ -1098,48 +1093,6 @@ HRESULT node_get_base_name(xmlnode *This, BSTR *name) return S_OK; } -static const struct IXMLDOMNodeVtbl xmlnode_vtbl = -{ - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL -}; - void destroy_xmlnode(xmlnode *This) { if(This->node) @@ -1151,7 +1104,6 @@ void init_xmlnode(xmlnode *This, xmlNodePtr node, IXMLDOMNode *node_iface, dispe if(node) xmldoc_add_ref( node->doc ); - This->IXMLDOMNode_iface.lpVtbl = &xmlnode_vtbl; This->node = node; This->iface = node_iface; @@ -1494,7 +1446,7 @@ static HRESULT WINAPI unknode_cloneNode( VARIANT_BOOL pbool, IXMLDOMNode** outNode) { unknode *This = unknode_from_IXMLDOMNode( iface ); - return IXMLDOMNode_cloneNode( &This->node.IXMLDOMNode_iface, pbool, outNode ); + return node_clone(&This->node, pbool, outNode ); } static HRESULT WINAPI unknode_get_nodeTypeString( @@ -1521,7 +1473,7 @@ static HRESULT WINAPI unknode_put_text( BSTR p) { unknode *This = unknode_from_IXMLDOMNode( iface ); - return IXMLDOMNode_put_text( &This->node.IXMLDOMNode_iface, p ); + return node_put_text(&This->node, p); } static HRESULT WINAPI unknode_get_specified( @@ -1566,7 +1518,8 @@ static HRESULT WINAPI unknode_get_dataType( VARIANT* var1) { unknode *This = unknode_from_IXMLDOMNode( iface ); - return IXMLDOMNode_get_dataType( &This->node.IXMLDOMNode_iface, var1 ); + TRACE("(%p)->(%p)\n", This, var1); + return return_null_var(var1); } static HRESULT WINAPI unknode_put_dataType( @@ -1642,7 +1595,7 @@ static HRESULT WINAPI unknode_get_prefix( BSTR* p) { unknode *This = unknode_from_IXMLDOMNode( iface ); - return IXMLDOMNode_get_prefix( &This->node.IXMLDOMNode_iface, p ); + return node_get_prefix(&This->node, p); } static HRESULT WINAPI unknode_get_baseName( @@ -1650,7 +1603,7 @@ static HRESULT WINAPI unknode_get_baseName( BSTR* p) { unknode *This = unknode_from_IXMLDOMNode( iface ); - return IXMLDOMNode_get_baseName( &This->node.IXMLDOMNode_iface, p ); + return node_get_base_name(&This->node, p); } static HRESULT WINAPI unknode_transformNodeToObject(

1 0

Nikolay Sivov : msxml3: Remove selectNodes() forward.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: 004944c81a288a3efdfba4ac774006ceddf1818a URL: http://source.winehq.org/git/wine.git/?a=commit;h=004944c81a288a3efdfba4ac7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 23 14:42:24 2011 +0300 msxml3: Remove selectNodes() forward. --- dlls/msxml3/attribute.c | 3 ++- dlls/msxml3/cdata.c | 3 ++- dlls/msxml3/comment.c | 3 ++- dlls/msxml3/docfrag.c | 3 ++- dlls/msxml3/domdoc.c | 7 ++++--- dlls/msxml3/element.c | 3 ++- dlls/msxml3/entityref.c | 3 ++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 18 ++++++------------ dlls/msxml3/pi.c | 3 ++- dlls/msxml3/text.c | 3 ++- 11 files changed, 27 insertions(+), 23 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 908c604..a2775b3 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -489,7 +489,8 @@ static HRESULT WINAPI domattr_selectNodes( BSTR p, IXMLDOMNodeList** outList) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList); + return node_select_nodes(&This->node, p, outList); } static HRESULT WINAPI domattr_selectSingleNode( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 3a22247..7dc72a4 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -499,7 +499,8 @@ static HRESULT WINAPI domcdata_selectNodes( BSTR p, IXMLDOMNodeList** outList) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList); + return node_select_nodes(&This->node, p, outList); } static HRESULT WINAPI domcdata_selectSingleNode( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 66d8000..378379d 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -492,7 +492,8 @@ static HRESULT WINAPI domcomment_selectNodes( BSTR p, IXMLDOMNodeList** outList) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList); + return node_select_nodes(&This->node, p, outList); } static HRESULT WINAPI domcomment_selectSingleNode( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 70d6925..bf480d6 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -496,7 +496,8 @@ static HRESULT WINAPI domfrag_selectNodes( BSTR p, IXMLDOMNodeList** outList) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList); + return node_select_nodes(&This->node, p, outList); } static HRESULT WINAPI domfrag_selectSingleNode( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index f1b8919..3463913 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1442,11 +1442,12 @@ static HRESULT WINAPI domdoc_transformNode( static HRESULT WINAPI domdoc_selectNodes( IXMLDOMDocument3 *iface, - BSTR queryString, - IXMLDOMNodeList** resultList ) + BSTR p, + IXMLDOMNodeList **outList) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, queryString, resultList ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList); + return node_select_nodes(&This->node, p, outList); } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index ec3b74c..bbcc302 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -948,7 +948,8 @@ static HRESULT WINAPI domelem_selectNodes( BSTR p, IXMLDOMNodeList** outList) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList); + return node_select_nodes(&This->node, p, outList); } static HRESULT WINAPI domelem_selectSingleNode( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index f1f8306..2c23c66 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -490,7 +490,8 @@ static HRESULT WINAPI entityref_selectNodes( BSTR p, IXMLDOMNodeList** outList) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList); + return node_select_nodes(&This->node, p, outList); } static HRESULT WINAPI entityref_selectSingleNode( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 8f99981..fdf4575 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -268,6 +268,7 @@ extern HRESULT node_remove_child(xmlnode*,IXMLDOMNode*,IXMLDOMNode**); extern HRESULT node_has_childnodes(const xmlnode*,VARIANT_BOOL*); extern HRESULT node_get_owner_doc(const xmlnode*,IXMLDOMDocument**); extern HRESULT node_get_text(const xmlnode*,BSTR*); +extern HRESULT node_select_nodes(const xmlnode*,BSTR,IXMLDOMNodeList**); extern HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index ac156a5..6ea3250 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1032,21 +1032,15 @@ static HRESULT WINAPI xmlnode_transformNode( #endif } -static HRESULT WINAPI xmlnode_selectNodes( - IXMLDOMNode *iface, - BSTR queryString, - IXMLDOMNodeList** resultList) +HRESULT node_select_nodes(const xmlnode *This, BSTR query, IXMLDOMNodeList **nodes) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); xmlChar* str; HRESULT hr; - TRACE("(%p)->(%s %p)\n", This, debugstr_w(queryString), resultList ); + if (!query || !nodes) return E_INVALIDARG; - if (!queryString || !resultList) return E_INVALIDARG; - - str = xmlChar_from_wchar(queryString); - hr = queryresult_create(This->node, str, resultList); + str = xmlChar_from_wchar(query); + hr = queryresult_create(This->node, str, nodes); heap_free(str); return hr; @@ -1161,7 +1155,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl = NULL, NULL, xmlnode_transformNode, - xmlnode_selectNodes, + NULL, xmlnode_selectSingleNode }; @@ -1632,7 +1626,7 @@ static HRESULT WINAPI unknode_selectNodes( BSTR p, IXMLDOMNodeList** outList) { unknode *This = unknode_from_IXMLDOMNode( iface ); - return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList ); + return node_select_nodes(&This->node, p, outList); } static HRESULT WINAPI unknode_selectSingleNode( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 2427d8e..27c41c1 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -507,7 +507,8 @@ static HRESULT WINAPI dom_pi_selectNodes( BSTR p, IXMLDOMNodeList** outList) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList); + return node_select_nodes(&This->node, p, outList); } static HRESULT WINAPI dom_pi_selectSingleNode( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 708ade0..ca11387 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -577,7 +577,8 @@ static HRESULT WINAPI domtext_selectNodes( BSTR p, IXMLDOMNodeList** outList) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList); + return node_select_nodes(&This->node, p, outList); } static HRESULT WINAPI domtext_selectSingleNode(

1 0

Alexandre Julliard : msxml3: Include the system libxml headers before the Windows headers.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: a1c8f6df847382336b1fc55f4e46d4cd5b58d1b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1c8f6df847382336b1fc55f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 24 13:11:53 2011 +0100 msxml3: Include the system libxml headers before the Windows headers. --- dlls/msxml3/attribute.c | 6 ++++++ dlls/msxml3/bsc.c | 5 +++++ dlls/msxml3/cdata.c | 5 +++++ dlls/msxml3/comment.c | 5 +++++ dlls/msxml3/dispex.c | 5 +++++ dlls/msxml3/docfrag.c | 5 +++++ dlls/msxml3/doctype.c | 5 +++++ dlls/msxml3/domdoc.c | 14 +++++++++----- dlls/msxml3/domimpl.c | 5 +++++ dlls/msxml3/element.c | 5 +++++ dlls/msxml3/entityref.c | 5 +++++ dlls/msxml3/factory.c | 5 +++++ dlls/msxml3/httprequest.c | 8 ++++++-- dlls/msxml3/main.c | 15 +++++++++++++++ dlls/msxml3/msxml_private.h | 27 --------------------------- dlls/msxml3/node.c | 31 +++++++++++++++++++++++++++---- dlls/msxml3/nodelist.c | 5 +++++ dlls/msxml3/nodemap.c | 5 +++++ dlls/msxml3/parseerror.c | 5 +++++ dlls/msxml3/pi.c | 5 +++++ dlls/msxml3/queryresult.c | 10 +++++++--- dlls/msxml3/saxreader.c | 10 +++++++--- dlls/msxml3/schema.c | 20 ++++++++++++-------- dlls/msxml3/stylesheet.c | 5 +++++ dlls/msxml3/text.c | 5 +++++ dlls/msxml3/xdr.c | 9 ++++++--- dlls/msxml3/xmldoc.c | 5 +++++ dlls/msxml3/xmlelem.c | 5 +++++ dlls/msxml3/xslpattern.h | 2 -- dlls/msxml3/xslpattern.l | 1 + dlls/msxml3/xslpattern.y | 1 + 31 files changed, 187 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1c8f6df847382336b1fc…

1 0

Huw Davies : oleaut32: Fix the typelib marshaler when the vtbl has holes.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: ac5e9812fdb6929e0fc3c9f3805223dd6062da62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac5e9812fdb6929e0fc3c9f38… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 24 10:09:36 2011 +0000 oleaut32: Fix the typelib marshaler when the vtbl has holes. --- dlls/oleaut32/tmarshal.c | 91 +++++++++++++++++++++++++++++++++------------- 1 files changed, 65 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 6536bb4..42eaadd 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -323,48 +323,85 @@ _get_typeinfo_for_iid(REFIID riid, ITypeInfo**ti) { } /* - * Determine the number of functions including all inherited functions. + * Determine the number of functions including all inherited functions + * and well as the size of the vtbl. * Note for non-dual dispinterfaces we simply return the size of IDispatch. */ -static HRESULT num_of_funcs(ITypeInfo *tinfo, unsigned int *num) +static HRESULT num_of_funcs(ITypeInfo *tinfo, unsigned int *num, + unsigned int *vtbl_size) { - HRESULT hres; + HRESULT hr; TYPEATTR *attr; ITypeInfo *tinfo2; + UINT inherited_funcs = 0, i; *num = 0; - hres = ITypeInfo_GetTypeAttr(tinfo, &attr); - if (hres) { - ERR("GetTypeAttr failed with %x\n",hres); - return hres; + if(vtbl_size) *vtbl_size = 0; + + hr = ITypeInfo_GetTypeAttr(tinfo, &attr); + if (hr) + { + ERR("GetTypeAttr failed with %x\n", hr); + return hr; } - if(attr->typekind == TKIND_DISPATCH && (attr->wTypeFlags & TYPEFLAG_FDUAL)) + if(attr->typekind == TKIND_DISPATCH) { - HREFTYPE href; - hres = ITypeInfo_GetRefTypeOfImplType(tinfo, -1, &href); - if(FAILED(hres)) + if(attr->wTypeFlags & TYPEFLAG_FDUAL) { - ERR("Unable to get interface href from dual dispinterface\n"); - goto end; + HREFTYPE href; + + ITypeInfo_ReleaseTypeAttr(tinfo, attr); + hr = ITypeInfo_GetRefTypeOfImplType(tinfo, -1, &href); + if(FAILED(hr)) + { + ERR("Unable to get interface href from dual dispinterface\n"); + return hr; + } + hr = ITypeInfo_GetRefTypeInfo(tinfo, href, &tinfo2); + if(FAILED(hr)) + { + ERR("Unable to get interface from dual dispinterface\n"); + return hr; + } + hr = num_of_funcs(tinfo2, num, vtbl_size); + ITypeInfo_Release(tinfo2); + return hr; } - hres = ITypeInfo_GetRefTypeInfo(tinfo, href, &tinfo2); - if(FAILED(hres)) + else /* non-dual dispinterface */ { - ERR("Unable to get interface from dual dispinterface\n"); - goto end; + /* These will be the size of IDispatchVtbl */ + *num = attr->cbSizeVft / sizeof(void *); + if(vtbl_size) *vtbl_size = attr->cbSizeVft; + ITypeInfo_ReleaseTypeAttr(tinfo, attr); + return hr; } - hres = num_of_funcs(tinfo2, num); - ITypeInfo_Release(tinfo2); } - else + + for (i = 0; i < attr->cImplTypes; i++) { - *num = attr->cbSizeVft / 4; + HREFTYPE href; + ITypeInfo *pSubTypeInfo; + UINT sub_funcs; + + hr = ITypeInfo_GetRefTypeOfImplType(tinfo, i, &href); + if (FAILED(hr)) goto end; + hr = ITypeInfo_GetRefTypeInfo(tinfo, href, &pSubTypeInfo); + if (FAILED(hr)) goto end; + + hr = num_of_funcs(pSubTypeInfo, &sub_funcs, NULL); + ITypeInfo_Release(pSubTypeInfo); + + if(FAILED(hr)) goto end; + inherited_funcs += sub_funcs; } + *num = inherited_funcs + attr->cFuncs; + if(vtbl_size) *vtbl_size = attr->cbSizeVft; + end: ITypeInfo_ReleaseTypeAttr(tinfo, attr); - return hres; + return hr; } #ifdef __i386__ @@ -1698,7 +1735,7 @@ static HRESULT init_proxy_entry_point(TMProxyImpl *proxy, unsigned int num) xasm->lret = 0xc2; xasm->bytestopop = (nrofargs+2)*4; /* pop args, This, iMethod */ xasm->nop = 0x90; - proxy->lpvtbl[num] = xasm; + proxy->lpvtbl[fdesc->oVft / sizeof(void *)] = xasm; #else FIXME("not implemented on non i386\n"); return E_FAIL; @@ -1713,7 +1750,7 @@ PSFacBuf_CreateProxy( { HRESULT hres; ITypeInfo *tinfo; - unsigned int i, nroffuncs; + unsigned int i, nroffuncs, vtbl_size; TMProxyImpl *proxy; TYPEATTR *typeattr; BOOL defer_to_dispatch = FALSE; @@ -1725,7 +1762,9 @@ PSFacBuf_CreateProxy( return hres; } - hres = num_of_funcs(tinfo, &nroffuncs); + hres = num_of_funcs(tinfo, &nroffuncs, &vtbl_size); + TRACE("Got %d funcs, vtbl size %d\n", nroffuncs, vtbl_size); + if (FAILED(hres)) { ERR("Cannot get number of functions for typeinfo %s\n",debugstr_guid(riid)); ITypeInfo_Release(tinfo); @@ -1756,7 +1795,7 @@ PSFacBuf_CreateProxy( InitializeCriticalSection(&proxy->crit); proxy->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": TMProxyImpl.crit"); - proxy->lpvtbl = HeapAlloc(GetProcessHeap(),0,sizeof(LPBYTE)*nroffuncs); + proxy->lpvtbl = HeapAlloc(GetProcessHeap(), 0, vtbl_size); /* if we derive from IDispatch then defer to its proxy for its methods */ hres = ITypeInfo_GetTypeAttr(tinfo, &typeattr);

1 0

Alexandre Julliard : winex11: Synchronize the mouse cursor in update_mouse_state.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: 94fb0f5935e37d2621c23ad8071b873e75eca055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94fb0f5935e37d2621c23ad80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 23 21:46:08 2011 +0100 winex11: Synchronize the mouse cursor in update_mouse_state. --- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/mouse.c | 94 ++++++++++++++++++++++----------------------- dlls/winex11.drv/window.c | 29 ++----------- dlls/winex11.drv/x11drv.h | 5 +- 4 files changed, 55 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=94fb0f5935e37d2621c23…

1 0