Jacek Caban : mshtml: Added IHTMLObjectElement::get_height implementation.
Alexandre Julliard
julliard at winehq.org
Thu Aug 16 15:26:14 CDT 2012
Module: wine
Branch: master
Commit: 7c54aa9fe731d8da0444c54ce8854ace1ccb4ee3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c54aa9fe731d8da0444c54ce8854ace1ccb4ee3
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Aug 16 15:43:03 2012 +0200
mshtml: Added IHTMLObjectElement::get_height implementation.
---
dlls/mshtml/htmlobject.c | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c
index 420b4d5..741011a 100644
--- a/dlls/mshtml/htmlobject.c
+++ b/dlls/mshtml/htmlobject.c
@@ -337,8 +337,28 @@ static HRESULT WINAPI HTMLObjectElement_put_height(IHTMLObjectElement *iface, VA
static HRESULT WINAPI HTMLObjectElement_get_height(IHTMLObjectElement *iface, VARIANT *p)
{
HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface);
- FIXME("(%p)->(%p)\n", This, p);
- return E_NOTIMPL;
+ nsAString height_str;
+ nsresult nsres;
+ HRESULT hres;
+
+ TRACE("(%p)->(%p)\n", This, p);
+
+ nsAString_Init(&height_str, NULL);
+ nsres = nsIDOMHTMLObjectElement_GetHeight(This->nsobject, &height_str);
+ if(NS_SUCCEEDED(nsres)) {
+ const PRUnichar *height;
+
+ nsAString_GetData(&height_str, &height);
+ V_VT(p) = VT_BSTR;
+ V_BSTR(p) = SysAllocString(height);
+ hres = V_BSTR(p) ? S_OK : E_OUTOFMEMORY;
+ }else {
+ ERR("GetHeight failed: %08x\n", nsres);
+ hres = E_FAIL;
+ }
+
+ nsAString_Finish(&height_str);
+ return hres;
}
static HRESULT WINAPI HTMLObjectElement_get_readyState(IHTMLObjectElement *iface, LONG *p)
More information about the wine-cvs
mailing list