May 2006 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Added IConnectionPointContainer stub implementation.
by Alexandre Julliard May 5, 2006

May 5, 2006

Module: wine Branch: refs/heads/master Commit: 570a1c4eeade854406d23cf813b556003f08619c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=570a1c4eeade854406d23cf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 28 19:59:58 2006 +0200 mshtml: Added IConnectionPointContainer stub implementation. --- dlls/mshtml/Makefile.in | 1 dlls/mshtml/conpoint.c | 93 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmldoc.c | 4 ++ dlls/mshtml/mshtml_private.h | 3 + 4 files changed, 101 insertions(+), 0 deletions(-) create mode 100644 dlls/mshtml/conpoint.c diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 817005d..e6044c7 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -9,6 +9,7 @@ EXTRALIBS = $(LIBUNICODE) -lstrmiids -lu EXTRADEFS = -DCOM_NO_WINDOWS_H C_SRCS = \ + conpoint.c \ hlink.c \ htmlbody.c \ htmldoc.c \ diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c new file mode 100644 index 0000000..0436aa6 --- /dev/null +++ b/dlls/mshtml/conpoint.c @@ -0,0 +1,93 @@ +/* + * Copyright 2006 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "config.h" + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" + +#include "wine/debug.h" + +#include "mshtml_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mshtml); + +#define CONPOINT(x) ((IConnectionPoint*) &(x)->lpConnectionPointVtbl); + +struct ConnectionPoint { + const IConnectionPointVtbl *lpConnectionPointVtbl; +}; + +#define CONPTCONT_THIS(iface) DEFINE_THIS(HTMLDocument, ConnectionPointContainer, iface) + +static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointContainer *iface, + REFIID riid, void **ppv) +{ + HTMLDocument *This = CONPTCONT_THIS(iface); + return IHTMLDocument2_QueryInterface(HTMLDOC(This), riid, ppv); +} + +static ULONG WINAPI ConnectionPointContainer_AddRef(IConnectionPointContainer *iface) +{ + HTMLDocument *This = CONPTCONT_THIS(iface); + return IHTMLDocument2_AddRef(HTMLDOC(This)); +} + +static ULONG WINAPI ConnectionPointContainer_Release(IConnectionPointContainer *iface) +{ + HTMLDocument *This = CONPTCONT_THIS(iface); + return IHTMLDocument2_Release(HTMLDOC(This)); +} + +static HRESULT WINAPI ConnectionPointContainer_EnumConnectionPoints(IConnectionPointContainer *iface, + IEnumConnectionPoints **ppEnum) +{ + HTMLDocument *This = CONPTCONT_THIS(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPointContainer *iface, + REFIID riid, IConnectionPoint **ppCP) +{ + HTMLDocument *This = CONPTCONT_THIS(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppCP); + return E_NOTIMPL; +} + +static const IConnectionPointContainerVtbl ConnectionPointContainerVtbl = { + ConnectionPointContainer_QueryInterface, + ConnectionPointContainer_AddRef, + ConnectionPointContainer_Release, + ConnectionPointContainer_EnumConnectionPoints, + ConnectionPointContainer_FindConnectionPoint +}; + +#undef CONPTCONT_THIS + +void HTMLDocument_ConnectionPoints_Init(HTMLDocument *This) +{ + This->lpConnectionPointContainerVtbl = &ConnectionPointContainerVtbl; +} diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 52035cc..e02cd76 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -107,6 +107,9 @@ static HRESULT WINAPI HTMLDocument_Query }else if(IsEqualGUID(&IID_IHlinkTarget, riid)) { TRACE("(%p)->(IID_IHlinkTarget, %p)\n", This, ppvObject); *ppvObject = HLNKTARGET(This); + }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { + TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppvObject); + *ppvObject = CONPTCONT(This); } if(*ppvObject) { @@ -1043,6 +1046,7 @@ HRESULT HTMLDocument_Create(IUnknown *pU HTMLDocument_Window_Init(ret); HTMLDocument_Service_Init(ret); HTMLDocument_Hlink_Init(ret); + HTMLDocument_ConnectionPoints_Init(ret); ret->nscontainer = NSContainer_Create(ret, NULL); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5f76ebb..3ebe445 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -62,6 +62,7 @@ typedef struct { const IOleCommandTargetVtbl *lpOleCommandTargetVtbl; const IOleControlVtbl *lpOleControlVtbl; const IHlinkTargetVtbl *lpHlinkTargetVtbl; + const IConnectionPointContainerVtbl *lpConnectionPointContainerVtbl; LONG ref; @@ -171,6 +172,7 @@ #define CMDTARGET(x) ((IOleCommandTa #define CONTROL(x) ((IOleControl*) &(x)->lpOleControlVtbl) #define STATUSCLB(x) ((IBindStatusCallback*) &(x)->lpBindStatusCallbackVtbl) #define HLNKTARGET(x) ((IHlinkTarget*) &(x)->lpHlinkTargetVtbl) +#define CONPTCONT(x) ((IConnectionPointContainer*) &(x)->lpConnectionPointContainerVtbl) #define NSWBCHROME(x) ((nsIWebBrowserChrome*) &(x)->lpWebBrowserChromeVtbl) #define NSCML(x) ((nsIContextMenuListener*) &(x)->lpContextMenuListenerVtbl) @@ -198,6 +200,7 @@ void HTMLDocument_View_Init(HTMLDocument void HTMLDocument_Window_Init(HTMLDocument*); void HTMLDocument_Service_Init(HTMLDocument*); void HTMLDocument_Hlink_Init(HTMLDocument*); +void HTMLDocument_ConnectionPoints_Init(HTMLDocument*); NSContainer *NSContainer_Create(HTMLDocument*,NSContainer*); void NSContainer_Release(NSContainer*);

1 0

Jacek Caban : mshtml: Added get_body implementation.
by Alexandre Julliard May 5, 2006

May 5, 2006

Module: wine Branch: refs/heads/master Commit: 77bb544c51ee3fcdaec4b73db9be82f7d9cbd21e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=77bb544c51ee3fcdaec4b73… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 28 19:58:38 2006 +0200 mshtml: Added get_body implementation. --- dlls/mshtml/htmldoc.c | 43 +++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/nsiface.idl | 28 ++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 25bb780..52035cc 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -204,8 +204,47 @@ static HRESULT WINAPI HTMLDocument_get_a static HRESULT WINAPI HTMLDocument_get_body(IHTMLDocument2 *iface, IHTMLElement **p) { - FIXME("(%p)->(%p)\n", iface, p); - return E_NOTIMPL; + HTMLDocument *This = HTMLDOC_THIS(iface); + nsIDOMDocument *nsdoc; + nsIDOMHTMLDocument *nshtmldoc; + nsIDOMHTMLElement *nsbody = NULL; + HTMLDOMNode *node; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + *p = NULL; + + if(!This->nscontainer) + return S_OK; + + nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); + if(NS_FAILED(nsres)) { + ERR("GetDocument failed: %08lx\n", nsres); + return S_OK; + } + + if(NS_FAILED(nsres) || !nsdoc) + return S_OK; + + nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMHTMLDocument, (void**)&nshtmldoc); + nsIDOMDocument_Release(nsdoc); + + nsres = nsIDOMHTMLDocument_GetBody(nshtmldoc, &nsbody); + nsIDOMHTMLDocument_Release(nshtmldoc); + + if(NS_FAILED(nsres) || !nsbody) { + TRACE("Could not get body: %08lx\n", nsres); + return S_OK; + } + + node = get_node(This, (nsIDOMNode*)nsbody); + nsIDOMHTMLElement_Release(nsbody); + + IHTMLDOMNode_QueryInterface(HTMLDOMNODE(node), &IID_IHTMLElement, (void**)p); + + TRACE("*p = %p\n", *p); + return S_OK; } static HRESULT WINAPI HTMLDocument_get_activeElement(IHTMLDocument2 *iface, IHTMLElement **p) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index e77090b..21b456e 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -107,6 +107,7 @@ typedef nsISupports nsIDOMProcessingInst typedef nsISupports nsIDOMEntityReference; typedef nsISupports nsIDOMHTMLFormElement; typedef nsISupports nsIDOMHTMLOptionsCollection; +typedef nsISupports nsIDOMHTMLCollection; [ object, @@ -475,6 +476,33 @@ interface nsIDOMDocument : nsIDOMNode [ object, + uuid(a6cf9084-15b3-11d2-932e-00805f8add32) +] +interface nsIDOMHTMLDocument : nsIDOMDocument +{ + nsresult GetTitle(nsAString *aTitle); + nsresult SetTitle(const nsAString *aTitle); + nsresult GetReferrer(nsAString *aReferrer); + nsresult GetDomain(nsAString *aDomain); + nsresult GetURL(nsAString *aURL); + nsresult GetBody(nsIDOMHTMLElement **aBody); + nsresult SetBody(nsIDOMHTMLElement *aBody); + nsresult GetImages(nsIDOMHTMLCollection **aImages); + nsresult GetApplets(nsIDOMHTMLCollection **aApplets); + nsresult GetLinks(nsIDOMHTMLCollection **aLinks); + nsresult GetForms(nsIDOMHTMLCollection **aForms); + nsresult GetAnchors(nsIDOMHTMLCollection **aAnchors); + nsresult GetCookie(nsAString *aCookie); + nsresult SetCookie(const nsAString *aCookie); + nsresult Open(void); + nsresult Close(void); + nsresult Write(const nsAString *text); + nsresult Writeln(const nsAString *text); + nsresult GetElementsByName(const nsAString *elementName, nsIDOMNodeList **_retval); +} + +[ + object, uuid(a6cf906b-15b3-11d2-932e-00805f8add32) ] interface nsIDOMWindow : nsISupports

1 0

Jacek Caban : mshtml: Added IHTMLTextContainer stub implementation.
by Alexandre Julliard May 5, 2006

May 5, 2006

Module: wine Branch: refs/heads/master Commit: d7f881f715dc0d04b25facf05890ac4390bc25b9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d7f881f715dc0d04b25facf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 28 19:57:28 2006 +0200 mshtml: Added IHTMLTextContainer stub implementation. --- dlls/mshtml/Makefile.in | 1 dlls/mshtml/htmlbody.c | 7 ++ dlls/mshtml/htmltextcont.c | 182 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 10 ++ 4 files changed, 200 insertions(+), 0 deletions(-) create mode 100644 dlls/mshtml/htmltextcont.c diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index b7cce4b..817005d 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -18,6 +18,7 @@ C_SRCS = \ htmlinput.c \ htmlnode.c \ htmlselect.c \ + htmltextcont.c \ htmltextarea.c \ main.c \ navigate.c \ diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index e55c06c..fea3507 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -38,6 +38,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { const IHTMLBodyElementVtbl *lpHTMLBodyElementVtbl; + HTMLTextContainer text_container; + HTMLElement *element; nsIDOMHTMLBodyElement *nsbody; } HTMLBodyElement; @@ -63,6 +65,9 @@ static HRESULT WINAPI HTMLBodyElement_Qu }else if(IsEqualGUID(&IID_IHTMLBodyElement, riid)) { TRACE("(%p)->(IID_IHTMLBodyElement %p)\n", This, ppv); *ppv = HTMLBODY(This); + }else if(IsEqualGUID(&IID_IHTMLTextContainer, riid)) { + TRACE("(%p)->(IID_IHTMLTextContainer %p)\n", This, ppv); + *ppv = HTMLTEXTCONT(&This->text_container); } if(*ppv) { @@ -436,6 +441,8 @@ void HTMLBodyElement_Create(HTMLElement ret->lpHTMLBodyElementVtbl = &HTMLBodyElementVtbl; ret->element = element; + HTMLTextContainer_Init(&ret->text_container, (IUnknown*)HTMLBODY(ret)); + nsres = nsIDOMHTMLElement_QueryInterface(element->nselem, &IID_nsIDOMHTMLBodyElement, (void**)&ret->nsbody); if(NS_FAILED(nsres)) diff --git a/dlls/mshtml/htmltextcont.c b/dlls/mshtml/htmltextcont.c new file mode 100644 index 0000000..2d6faf9 --- /dev/null +++ b/dlls/mshtml/htmltextcont.c @@ -0,0 +1,182 @@ +/* + * Copyright 2006 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "config.h" + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" + +#include "wine/debug.h" + +#include "mshtml_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mshtml); + +#define HTMLTEXTCONT_THIS(iface) DEFINE_THIS(HTMLTextContainer, HTMLTextContainer, iface) + +static HRESULT WINAPI HTMLTextContainer_QueryInterface(IHTMLTextContainer *iface, + REFIID riid, void **ppv) +{ + HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + return IUnknown_QueryInterface(This->impl, riid, ppv); +} + +static ULONG WINAPI HTMLTextContainer_AddRef(IHTMLTextContainer *iface) +{ + HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + return IUnknown_AddRef(This->impl); +} + +static ULONG WINAPI HTMLTextContainer_Release(IHTMLTextContainer *iface) +{ + HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + return IUnknown_Release(This->impl); +} + +static HRESULT WINAPI HTMLTextContainer_GetTypeInfoCount(IHTMLTextContainer *iface, UINT *pctinfo) +{ + HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLTextContainer_GetTypeInfo(IHTMLTextContainer *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLTextContainer_GetIDsOfNames(IHTMLTextContainer *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + FIXME("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLTextContainer_Invoke(IHTMLTextContainer *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + FIXME("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLTextContainer_createControlRange(IHTMLTextContainer *iface, + IDispatch **range) +{ + HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + FIXME("(%p)->(%p)\n", This, range); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLTextContainer_get_scrollHeight(IHTMLTextContainer *iface, long *p) +{ + HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLTextContainer_get_scrollWidth(IHTMLTextContainer *iface, long *p) +{ + HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLTextContainer_put_scrollTop(IHTMLTextContainer *iface, long v) +{ + HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + FIXME("(%p)->(%ld)\n", This, v); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLTextContainer_get_scrollTop(IHTMLTextContainer *iface, long *p) +{ + HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLTextContainer_put_scrollLeft(IHTMLTextContainer *iface, long v) +{ + HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + FIXME("(%p)->(%ld)\n", This, v); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLTextContainer_get_scrollLeft(IHTMLTextContainer *iface, long *p) +{ + HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLTextContainer_put_onscroll(IHTMLTextContainer *iface, VARIANT v) +{ + HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLTextContainer_get_onscroll(IHTMLTextContainer *iface, VARIANT *p) +{ + HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +#undef HTMLTEXTCONT_THIS + +static const IHTMLTextContainerVtbl HTMLTextContainerVtbl = { + HTMLTextContainer_QueryInterface, + HTMLTextContainer_AddRef, + HTMLTextContainer_Release, + HTMLTextContainer_GetTypeInfoCount, + HTMLTextContainer_GetTypeInfo, + HTMLTextContainer_GetIDsOfNames, + HTMLTextContainer_Invoke, + HTMLTextContainer_createControlRange, + HTMLTextContainer_get_scrollHeight, + HTMLTextContainer_get_scrollWidth, + HTMLTextContainer_put_scrollTop, + HTMLTextContainer_get_scrollTop, + HTMLTextContainer_put_scrollLeft, + HTMLTextContainer_get_scrollLeft, + HTMLTextContainer_put_onscroll, + HTMLTextContainer_get_onscroll +}; + +void HTMLTextContainer_Init(HTMLTextContainer *This, IUnknown *impl) +{ + This->lpHTMLTextContainerVtbl = &HTMLTextContainerVtbl; + This->impl = impl; +} diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 478f152..5f76ebb 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -145,6 +145,12 @@ typedef struct { IUnknown *impl; } HTMLElement; +typedef struct { + const IHTMLTextContainerVtbl *lpHTMLTextContainerVtbl; + + IUnknown *impl; +} HTMLTextContainer; + #define HTMLDOC(x) ((IHTMLDocument2*) &(x)->lpHTMLDocument2Vtbl) #define HTMLDOC3(x) ((IHTMLDocument3*) &(x)->lpHTMLDocument3Vtbl) #define PERSIST(x) ((IPersist*) &(x)->lpPersistFileVtbl) @@ -179,6 +185,8 @@ #define HTMLELEM(x) ((IHTMLElement* #define HTMLELEM2(x) ((IHTMLElement2*) &(x)->lpHTMLElement2Vtbl) #define HTMLDOMNODE(x) ((IHTMLDOMNode*) &(x)->lpHTMLDOMNodeVtbl) +#define HTMLTEXTCONT(x) ((IHTMLTextContainer*) &(x)->lpHTMLTextContainerVtbl) + #define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) HRESULT HTMLDocument_Create(IUnknown*,REFIID,void**); @@ -233,6 +241,8 @@ void HTMLTextAreaElement_Create(HTMLElem void HTMLElement2_Init(HTMLElement*); +void HTMLTextContainer_Init(HTMLTextContainer*,IUnknown*); + HRESULT HTMLDOMNode_QI(HTMLDOMNode*,REFIID,void**); HRESULT HTMLElement_QI(HTMLElement*,REFIID,void**);

1 0

Jacek Caban : mshtml: Added IHTMLTextContainer declaration.
by Alexandre Julliard May 5, 2006

May 5, 2006

Module: wine Branch: refs/heads/master Commit: 1a8397671ec276b16b915cdfa90bf309bb138b7a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1a8397671ec276b16b915cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 28 19:55:43 2006 +0200 mshtml: Added IHTMLTextContainer declaration. --- include/mshtmdid.h | 8 ++++++++ include/mshtml.idl | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 23f2b84..4ab48a5 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -1817,4 +1817,12 @@ #define DISPID_IHTMLCURRENTSTYLE_OVERFLO #define DISPID_IHTMLCURRENTSTYLE_OVERFLOWY DISPID_A_OVERFLOWY #define DISPID_IHTMLCURRENTSTYLE_TEXTTRANSFORM DISPID_A_TEXTTRANSFORM +/* IHTMLTextContainer */ +#define DISPID_IHTMLTEXTCONTAINER_CREATECONTROLRANGE DISPID_TEXTSITE+1 +#define DISPID_IHTMLTEXTCONTAINER_SCROLLHEIGHT DISPID_TEXTSITE+2 +#define DISPID_IHTMLTEXTCONTAINER_SCROLLWIDTH DISPID_TEXTSITE+3 +#define DISPID_IHTMLTEXTCONTAINER_SCROLLTOP DISPID_TEXTSITE+4 +#define DISPID_IHTMLTEXTCONTAINER_SCROLLLEFT DISPID_TEXTSITE+5 +#define DISPID_IHTMLTEXTCONTAINER_ONSCROLL DISPID_EVPROP_ONSCROLL + #endif /* __MSHTMDID_H__ */ diff --git a/include/mshtml.idl b/include/mshtml.idl index 6ce9772..2f82392 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -2682,6 +2682,45 @@ interface IHTMLFormElement : IDispatch } /***************************************************************************** + * IHTMLTextContainer interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f230-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLTextContainer : IDispatch +{ + [id(DISPID_IHTMLTEXTCONTAINER_CREATECONTROLRANGE)] + HRESULT createControlRange([retval, out] IDispatch **range); + + [propget, id(DISPID_IHTMLTEXTCONTAINER_SCROLLHEIGHT), displaybind, bindable] + HRESULT scrollHeight([retval, out] long *p); + + [propget, id(DISPID_IHTMLTEXTCONTAINER_SCROLLWIDTH), displaybind, bindable] + HRESULT scrollWidth([retval, out] long *p); + + [propput, id(DISPID_IHTMLTEXTCONTAINER_SCROLLTOP), displaybind, bindable] + HRESULT scrollTop([in] long v); + + [propget, id(DISPID_IHTMLTEXTCONTAINER_SCROLLTOP), displaybind, bindable] + HRESULT scrollTop([retval, out] long *p); + + [propput, id(DISPID_IHTMLTEXTCONTAINER_SCROLLLEFT), displaybind, bindable] + HRESULT scrollLeft([in] long v); + + [propget, id(DISPID_IHTMLTEXTCONTAINER_SCROLLLEFT), displaybind, bindable] + HRESULT scrollLeft([retval, out] long *p); + + [propput, id(DISPID_IHTMLTEXTCONTAINER_ONSCROLL), displaybind, bindable] + HRESULT onscroll([in] VARIANT v); + + [propget, id(DISPID_IHTMLTEXTCONTAINER_ONSCROLL), displaybind, bindable] + HRESULT onscroll([retval, out] VARIANT *p); +} + +/***************************************************************************** * IHTMLImgElement interface */ [

1 0

Fatih Asici : fonts: Add missing Latin glyph to ms_sans_serif.
by Alexandre Julliard May 5, 2006

May 5, 2006

Module: wine Branch: refs/heads/master Commit: 9647321d3fbc792745565a0488197f5c56b1ed3d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9647321d3fbc792745565a0… Author: Fatih Asici <fasici(a)linux-sevenler.org> Date: Fri Apr 28 21:05:34 2006 +0300 fonts: Add missing Latin glyph to ms_sans_serif. --- fonts/ms_sans_serif.sfd | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/fonts/ms_sans_serif.sfd b/fonts/ms_sans_serif.sfd index 5cefbc8..22316bc 100644 --- a/fonts/ms_sans_serif.sfd +++ b/fonts/ms_sans_serif.sfd @@ -48,7 +48,7 @@ AntiAlias: 0 FitToEm: 1 WinInfo: 667 29 23 OnlyBitmaps: 1 -BeginChars: 65536 353 +BeginChars: 65536 354 StartChar: space Encoding: 32 32 0 Width: 2 @@ -1940,8 +1940,13 @@ Width: 5 Flags: HW TeX: 97 0 0 0 EndChar +StartChar: scommaaccent +Encoding: 537 537 353 +Width: 13 +TeX: 0 0 0 0 +EndChar EndChars -BitmapFont: 13 353 11 2 1 +BitmapFont: 13 354 11 2 1 BDFChar: 0 32 3 0 0 0 0 z BDFChar: 1 33 3 1 1 0 8 @@ -2484,8 +2489,8 @@ BDFChar: 269 346 7 1 5 0 10 &0PqJJ:MSE#`*F" BDFChar: 270 347 5 1 4 0 8 &0Ls\O?aqM?iU0, -BDFChar: 271 350 7 1 5 -2 10 -&0PqJJ:MSE#`*FB?iU0, +BDFChar: 271 350 7 1 5 -2 8 +E/9$pE!Q`*E$/Ng BDFChar: 272 351 5 1 4 -2 5 @$!VrOC02= BDFChar: 273 352 7 1 5 0 10 @@ -2649,7 +2654,7 @@ BDFChar: 351 1025 7 1 5 0 10 BDFChar: 352 1105 6 1 5 0 7 :]PHjn:6=6 EndBitmapFont -BitmapFont: 16 353 13 3 1 FontForge +BitmapFont: 16 354 13 3 1 FontForge BDFChar: 0 32 3 0 0 0 0 z BDFChar: 1 33 3 1 1 0 9 @@ -3357,7 +3362,7 @@ BDFChar: 351 1025 9 1 7 0 12 BDFChar: 352 1105 8 1 6 0 9 8,rX7KS98RKQmIs EndBitmapFont -BitmapFont: 20 353 16 4 1 FontForge +BitmapFont: 20 354 16 4 1 FontForge BDFChar: 0 32 4 0 0 0 0 z BDFChar: 1 33 4 2 2 0 11 @@ -3832,6 +3837,10 @@ BDFChar: 263 338 5 0 3 0 11 E,]c8E,]c8E,]c8 BDFChar: 264 339 5 0 3 0 11 E,]c8E,]c8E,]c8 +BDFChar: 271 350 11 1 9 -4 11 +4odkKJ:N.M5QEtJ!<<+M!.]TM5la(K#QOu-"998= +BDFChar: 272 351 8 1 6 -4 8 +G_CTtGQ\/&GRt,d0E;(Q BDFChar: 273 352 5 0 3 0 11 E,]c8E,]c8E,]c8 BDFChar: 274 353 5 0 3 0 11 @@ -3958,5 +3967,7 @@ BDFChar: 351 1025 11 2 9 0 13 ,QRjpJ:N1JJ:N0#JH#TL BDFChar: 352 1105 9 0 8 0 12 z+ohTC)uq/_5lcB75QF%L5l`)/)uos= +BDFChar: 353 537 20 0 0 0 0 +z EndBitmapFont EndSplineFont

1 0

Fatih Asici : fonts: Add some missing Latin glyphs to System.
by Alexandre Julliard May 5, 2006

May 5, 2006

Module: wine Branch: refs/heads/master Commit: 9899ef9de093208366b7255c1632e880dc57f6ed URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9899ef9de093208366b7255… Author: Fatih Asici <fasici(a)linux-sevenler.org> Date: Fri Apr 28 21:06:43 2006 +0300 fonts: Add some missing Latin glyphs to System. --- fonts/system.sfd | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diff --git a/fonts/system.sfd b/fonts/system.sfd index fa29b75..ddc1d8f 100644 --- a/fonts/system.sfd +++ b/fonts/system.sfd @@ -44,7 +44,7 @@ AntiAlias: 0 FitToEm: 1 WinInfo: 0 20 18 OnlyBitmaps: 1 -BeginChars: 65536 433 +BeginChars: 65536 437 StartChar: space Encoding: 32 32 0 Width: 4 @@ -2365,8 +2365,32 @@ Encoding: 976 976 432 Width: 16 TeX: 117 0 0 0 EndChar +StartChar: dotlessi +Encoding: 305 305 433 +Width: 16 +Flags: W +TeX: 0 0 0 0 +EndChar +StartChar: Idotaccent +Encoding: 304 304 434 +Width: 16 +Flags: W +TeX: 0 0 0 0 +EndChar +StartChar: gbreve +Encoding: 287 287 435 +Width: 16 +Flags: W +TeX: 0 0 0 0 +EndChar +StartChar: Gbreve +Encoding: 286 286 436 +Width: 16 +Flags: W +TeX: 0 0 0 0 +EndChar EndChars -BitmapFont: 16 433 13 3 1 +BitmapFont: 16 437 13 3 1 BDFChar: 0 32 4 14 14 0 0 z BDFChar: 1 33 4 1 2 0 9 @@ -3233,5 +3257,13 @@ BDFChar: 431 975 16 0 0 0 0 z BDFChar: 432 976 16 0 0 0 0 z +BDFChar: 433 305 4 1 2 0 6 +^qdb$^qd_c +BDFChar: 434 304 4 1 2 0 12 +^q]rc^qdb$^qdb$^]4?7 +BDFChar: 435 287 8 1 6 -3 9 +b]j,8bfn;Tb^9iCGQ7^D +BDFChar: 436 286 10 1 8 0 12 +_gVSJB#DF"cbmY54TGH^ EndBitmapFont EndSplineFont

1 0

Fatih Asici : fonts: Add some missing Latin glyphs to Courier.
by Alexandre Julliard May 5, 2006

May 5, 2006

Module: wine Branch: refs/heads/master Commit: 08ce163d5ee15912977ad39d1546cad9ce5d8d68 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=08ce163d5ee15912977ad39… Author: Fatih Asici <fasici(a)linux-sevenler.org> Date: Fri Apr 28 21:00:58 2006 +0300 fonts: Add some missing Latin glyphs to Courier. --- fonts/courier.sfd | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 41 insertions(+), 2 deletions(-) diff --git a/fonts/courier.sfd b/fonts/courier.sfd index bb3686d..c10fe55 100644 --- a/fonts/courier.sfd +++ b/fonts/courier.sfd @@ -46,7 +46,7 @@ FitToEm: 1 WinInfo: 902 22 21 OnlyBitmaps: 1 TeXData: 1 0 0 346030 173015 115343 0 1048576 115343 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 65536 347 +BeginChars: 65536 352 StartChar: space Encoding: 32 32 0 Width: 8 @@ -1801,8 +1801,37 @@ Width: 8 Flags: HW TeX: 97 0 0 0 EndChar +StartChar: dotlessi +Encoding: 305 305 347 +Width: 8 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: Idotaccent +Encoding: 304 304 348 +Width: 8 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: gbreve +Encoding: 287 287 349 +Width: 8 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: gcircumflex +Encoding: 285 285 350 +Width: 8 +TeX: 0 0 0 0 +EndChar +StartChar: Gbreve +Encoding: 286 286 351 +Width: 8 +Flags: HW +TeX: 0 0 0 0 +EndChar EndChars -BitmapFont: 13 347 11 2 1 +BitmapFont: 13 352 11 2 1 BDFChar: 0 32 8 0 0 0 0 z BDFChar: 1 33 8 4 4 0 8 @@ -2497,5 +2526,15 @@ BDFChar: 345 1025 8 1 7 0 10 6id3Q5Y-,j5XPGM BDFChar: 346 1105 8 0 7 -1 9 !$VCC5!aZ`5s>8K +BDFChar: 347 305 8 2 6 0 5 +i#j-b+SYp: +BDFChar: 348 304 8 2 6 0 10 ++9;0Z+<VdL+<^FZ +BDFChar: 349 287 8 1 7 -2 8 +6oY0qKS5#3Hj"Zo +BDFChar: 350 285 8 0 0 0 0 +z +BDFChar: 351 286 8 1 7 0 10 +6o[:qJ:N01JjMR" EndBitmapFont EndSplineFont

1 0

Huw Davies : oleaut32: Implement GetDocumentation_Proxy/Stub.
by Alexandre Julliard May 5, 2006

May 5, 2006

Module: wine Branch: refs/heads/master Commit: e783531ec26d795df3c84651f4af405b2a315e46 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e783531ec26d795df3c8465… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 28 14:50:11 2006 +0100 oleaut32: Implement GetDocumentation_Proxy/Stub. --- dlls/oleaut32/usrmarshal.c | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index f71aeac..9140c9e 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1418,8 +1418,27 @@ HRESULT CALLBACK ITypeInfo_GetDocumentat DWORD* pdwHelpContext, BSTR* pBstrHelpFile) { - FIXME("not implemented\n"); - return E_FAIL; + DWORD help_context; + BSTR name, doc_string, help_file; + HRESULT hr; + TRACE("(%p, %08lx, %p, %p, %p, %p)\n", This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); + + /* FIXME: presumably refPtrFlags is supposed to be a bitmask of which ptrs we actually want? */ + hr = ITypeInfo_RemoteGetDocumentation_Proxy(This, memid, 0, &name, &doc_string, &help_context, &help_file); + if(SUCCEEDED(hr)) + { + if(pBstrName) *pBstrName = name; + else SysFreeString(name); + + if(pBstrDocString) *pBstrDocString = doc_string; + else SysFreeString(doc_string); + + if(pBstrHelpFile) *pBstrHelpFile = help_file; + else SysFreeString(help_file); + + if(pdwHelpContext) *pdwHelpContext = help_context; + } + return hr; } HRESULT __RPC_STUB ITypeInfo_GetDocumentation_Stub( @@ -1431,8 +1450,9 @@ HRESULT __RPC_STUB ITypeInfo_GetDocument DWORD* pdwHelpContext, BSTR* pBstrHelpFile) { - FIXME("not implemented\n"); - return E_FAIL; + TRACE("(%p, %08lx, %08lx, %p, %p, %p, %p)\n", This, memid, refPtrFlags, pBstrName, pBstrDocString, + pdwHelpContext, pBstrHelpFile); + return ITypeInfo_GetDocumentation(This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); } HRESULT CALLBACK ITypeInfo_GetDllEntry_Proxy(

1 0

Huw Davies : oleaut32: Implement GetFuncDesc_Proxy and friends.
by Alexandre Julliard May 5, 2006

May 5, 2006

Module: wine Branch: refs/heads/master Commit: 5e69b5d9ffa5c19e2eb34123a9ba9bedb6af593f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5e69b5d9ffa5c19e2eb3412… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 28 14:48:38 2006 +0100 oleaut32: Implement GetFuncDesc_Proxy and friends. --- dlls/oleaut32/usrmarshal.c | 50 ++++++++++++++++++++++++++++++++++++++------ 1 files changed, 43 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index b9149f9..f71aeac 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1201,6 +1201,13 @@ static void free_embedded_typedesc(TYPED } } +static void free_embedded_elemdesc(ELEMDESC *edesc) +{ + free_embedded_typedesc(&edesc->tdesc); + if(edesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) + CoTaskMemFree(edesc->u.paramdesc.pparamdescex); +} + /* ITypeComp */ HRESULT CALLBACK ITypeComp_Bind_Proxy( @@ -1294,8 +1301,14 @@ HRESULT CALLBACK ITypeInfo_GetFuncDesc_P UINT index, FUNCDESC** ppFuncDesc) { - FIXME("not implemented\n"); - return E_FAIL; + CLEANLOCALSTORAGE stg; + TRACE("(%p, %d, %p)\n", This, index, ppFuncDesc); + + stg.flags = 0; + stg.pStorage = NULL; + stg.pInterface = NULL; + + return ITypeInfo_RemoteGetFuncDesc_Proxy(This, index, ppFuncDesc, &stg); } HRESULT __RPC_STUB ITypeInfo_GetFuncDesc_Stub( @@ -1304,8 +1317,18 @@ HRESULT __RPC_STUB ITypeInfo_GetFuncDesc LPFUNCDESC* ppFuncDesc, CLEANLOCALSTORAGE* pDummy) { - FIXME("not implemented\n"); - return E_FAIL; + HRESULT hr; + TRACE("(%p, %d, %p)\n", This, index, ppFuncDesc); + + hr = ITypeInfo_GetFuncDesc(This, index, ppFuncDesc); + if(hr != S_OK) + return hr; + + pDummy->flags = CLS_FUNCDESC; + ITypeInfo_AddRef(This); + pDummy->pInterface = (IUnknown*)This; + pDummy->pStorage = ppFuncDesc; + return hr; } HRESULT CALLBACK ITypeInfo_GetVarDesc_Proxy( @@ -1527,14 +1550,27 @@ void CALLBACK ITypeInfo_ReleaseFuncDesc_ ITypeInfo* This, FUNCDESC* pFuncDesc) { - FIXME("not implemented\n"); + SHORT param; + TRACE("(%p, %p)\n", This, pFuncDesc); + + for(param = 0; param < pFuncDesc->cParams; param++) + free_embedded_elemdesc(pFuncDesc->lprgelemdescParam + param); + if(param) + CoTaskMemFree(pFuncDesc->lprgelemdescParam); + + free_embedded_elemdesc(&pFuncDesc->elemdescFunc); + + if(pFuncDesc->cScodes != 0 && pFuncDesc->cScodes != -1) + CoTaskMemFree(pFuncDesc->lprgscode); + + CoTaskMemFree(pFuncDesc); } HRESULT __RPC_STUB ITypeInfo_ReleaseFuncDesc_Stub( ITypeInfo* This) { - FIXME("not implemented\n"); - return E_FAIL; + TRACE("nothing to do\n"); + return S_OK; } void CALLBACK ITypeInfo_ReleaseVarDesc_Proxy(

1 0

Huw Davies : oleaut32: Implement GetTypeAttr_Proxy and friends.
by Alexandre Julliard May 5, 2006

May 5, 2006

Module: wine Branch: refs/heads/master Commit: 32a626fdbdd70a3bbc9c7622317683ddb17aa1e6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=32a626fdbdd70a3bbc9c762… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 28 14:42:43 2006 +0100 oleaut32: Implement GetTypeAttr_Proxy and friends. --- dlls/oleaut32/usrmarshal.c | 68 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 61 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index c090186..b9149f9 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1166,6 +1166,41 @@ HRESULT __RPC_STUB IEnumVARIANT_Next_Stu return hr; } +/* TypeInfo related freers */ + +static void free_embedded_typedesc(TYPEDESC *tdesc); +static void free_embedded_arraydesc(ARRAYDESC *adesc) +{ + switch(adesc->tdescElem.vt) + { + case VT_PTR: + case VT_SAFEARRAY: + free_embedded_typedesc(adesc->tdescElem.u.lptdesc); + CoTaskMemFree(adesc->tdescElem.u.lptdesc); + break; + case VT_CARRAY: + free_embedded_arraydesc(adesc->tdescElem.u.lpadesc); + CoTaskMemFree(adesc->tdescElem.u.lpadesc); + break; + } +} + +static void free_embedded_typedesc(TYPEDESC *tdesc) +{ + switch(tdesc->vt) + { + case VT_PTR: + case VT_SAFEARRAY: + free_embedded_typedesc(tdesc->u.lptdesc); + CoTaskMemFree(tdesc->u.lptdesc); + break; + case VT_CARRAY: + free_embedded_arraydesc(tdesc->u.lpadesc); + CoTaskMemFree(tdesc->u.lpadesc); + break; + } +} + /* ITypeComp */ HRESULT CALLBACK ITypeComp_Bind_Proxy( @@ -1223,9 +1258,16 @@ HRESULT __RPC_STUB ITypeComp_BindType_St HRESULT CALLBACK ITypeInfo_GetTypeAttr_Proxy( ITypeInfo* This, TYPEATTR** ppTypeAttr) + { - FIXME("not implemented\n"); - return E_FAIL; + CLEANLOCALSTORAGE stg; + TRACE("(%p, %p)\n", This, ppTypeAttr); + + stg.flags = 0; + stg.pStorage = NULL; + stg.pInterface = NULL; + + return ITypeInfo_RemoteGetTypeAttr_Proxy(This, ppTypeAttr, &stg); } HRESULT __RPC_STUB ITypeInfo_GetTypeAttr_Stub( @@ -1233,8 +1275,18 @@ HRESULT __RPC_STUB ITypeInfo_GetTypeAttr LPTYPEATTR* ppTypeAttr, CLEANLOCALSTORAGE* pDummy) { - FIXME("not implemented\n"); - return E_FAIL; + HRESULT hr; + TRACE("(%p, %p)\n", This, ppTypeAttr); + + hr = ITypeInfo_GetTypeAttr(This, ppTypeAttr); + if(hr != S_OK) + return hr; + + pDummy->flags = CLS_TYPEATTR; + ITypeInfo_AddRef(This); + pDummy->pInterface = (IUnknown*)This; + pDummy->pStorage = ppTypeAttr; + return hr; } HRESULT CALLBACK ITypeInfo_GetFuncDesc_Proxy( @@ -1459,14 +1511,16 @@ void CALLBACK ITypeInfo_ReleaseTypeAttr_ ITypeInfo* This, TYPEATTR* pTypeAttr) { - FIXME("not implemented\n"); + TRACE("(%p, %p)\n", This, pTypeAttr); + free_embedded_typedesc(&pTypeAttr->tdescAlias); + CoTaskMemFree(pTypeAttr); } HRESULT __RPC_STUB ITypeInfo_ReleaseTypeAttr_Stub( ITypeInfo* This) { - FIXME("not implemented\n"); - return E_FAIL; + TRACE("nothing to do\n"); + return S_OK; } void CALLBACK ITypeInfo_ReleaseFuncDesc_Proxy(

1 0