Piotr Caban : mshtml: Remove no longer needed get_attr_from_nselem function .
Alexandre Julliard
julliard at winehq.org
Tue Aug 23 12:45:05 CDT 2011
Module: wine
Branch: master
Commit: 6e1ad65dc356d8b3927ebce3c3034fdab37fea71
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e1ad65dc356d8b3927ebce3c3034fdab37fea71
Author: Piotr Caban <piotr at codeweavers.com>
Date: Tue Aug 23 11:33:52 2011 +0200
mshtml: Remove no longer needed get_attr_from_nselem function.
---
dlls/mshtml/htmlelem3.c | 58 +---------------------------------------------
1 files changed, 2 insertions(+), 56 deletions(-)
diff --git a/dlls/mshtml/htmlelem3.c b/dlls/mshtml/htmlelem3.c
index ece779d..73ca1ed 100644
--- a/dlls/mshtml/htmlelem3.c
+++ b/dlls/mshtml/htmlelem3.c
@@ -556,58 +556,6 @@ static HRESULT WINAPI HTMLElement4_normalize(IHTMLElement4 *iface)
return E_NOTIMPL;
}
-/* FIXME: This should be done in IDispatchEx implementation layer */
-static BOOL get_attr_from_nselem(HTMLElement *This, BSTR name, DISPID *dispid)
-{
- const PRUnichar *v;
- nsIDOMAttr *nsattr;
- nsAString nsstr;
- BSTR val = NULL;
- nsresult nsres;
- HRESULT hres;
-
- nsAString_InitDepend(&nsstr, name);
- nsres = nsIDOMHTMLElement_GetAttributeNode(This->nselem, &nsstr, &nsattr);
- nsAString_Finish(&nsstr);
- if(NS_FAILED(nsres) || !nsattr)
- return FALSE;
-
- FIXME("HACK\n");
-
- nsAString_Init(&nsstr, NULL);
- nsres = nsIDOMAttr_GetNodeValue(nsattr, &nsstr);
- if(NS_FAILED(nsres)) {
- nsAString_Finish(&nsstr);
- return FALSE;
- }
-
- nsAString_GetData(&nsstr, &v);
- if(*v) {
- val = SysAllocString(v);
- if(!val) {
- nsAString_Finish(&nsstr);
- return FALSE;
- }
- }
- nsAString_Finish(&nsstr);
-
- hres = IDispatchEx_GetDispID(&This->node.dispex.IDispatchEx_iface, name, fdexNameEnsure, dispid);
- if(SUCCEEDED(hres)) {
- VARIANT arg;
- DISPPARAMS dp = {&arg, NULL, 1, 0};
- EXCEPINFO ei;
-
- V_VT(&arg) = VT_BSTR;
- V_BSTR(&arg) = val;
- memset(&ei, 0, sizeof(ei));
- hres = IDispatchEx_InvokeEx(&This->node.dispex.IDispatchEx_iface, *dispid,
- LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, &dp, NULL, &ei, NULL);
- }
-
- SysFreeString(val);
- return SUCCEEDED(hres);
-}
-
static HRESULT WINAPI HTMLElement4_getAttributeNode(IHTMLElement4 *iface, BSTR bstrname, IHTMLDOMAttribute **ppAttribute)
{
HTMLElement *This = impl_from_IHTMLElement4(iface);
@@ -619,10 +567,8 @@ static HRESULT WINAPI HTMLElement4_getAttributeNode(IHTMLElement4 *iface, BSTR b
hres = IDispatchEx_GetDispID(&This->node.dispex.IDispatchEx_iface, bstrname, fdexNameCaseInsensitive, &dispid);
if(hres == DISP_E_UNKNOWNNAME) {
- if(!get_attr_from_nselem(This, bstrname, &dispid)) {
- *ppAttribute = NULL;
- return S_OK;
- }
+ *ppAttribute = NULL;
+ return S_OK;
}else if(FAILED(hres)) {
return hres;
}
More information about the wine-cvs
mailing list