Jacek Caban : mshtml: Store HTMLElement struct instead of pointer in HTMLInputElement.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8a8af7b48313c5cf2855182d5c0c7c7fbe84e706
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8a8af7b48313c5cf2855182d5c...

Author: Jacek Caban 
Date:   Sat Sep 15 16:06:36 2007 +0200

mshtml: Store HTMLElement struct instead of pointer in HTMLInputElement.

---

dlls/mshtml/htmlelem.c       |    6 +++---
 dlls/mshtml/htmlinput.c      |   20 +++++++++++---------
 dlls/mshtml/mshtml_private.h |    2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c
index 4c9743d..20415ba 100644
--- a/dlls/mshtml/htmlelem.c
+++ b/dlls/mshtml/htmlelem.c
@@ -1298,6 +1298,8 @@ HTMLElement *HTMLElement_Create(nsIDOMNode *nsnode)
         ret = HTMLAnchorElement_Create(nselem);
     else if(!strcmpW(class_name, wszBODY))
         ret = HTMLBodyElement_Create(nselem);
+    else if(!strcmpW(class_name, wszINPUT))
+        ret = HTMLInputElement_Create(nselem);
     else {
         ret = mshtml_alloc(sizeof(HTMLElement));

@@ -1305,9 +1307,7 @@ HTMLElement *HTMLElement_Create(nsIDOMNode *nsnode)
         ret->destructor = NULL;
         ret->nselem = nselem;

-        if(!strcmpW(class_name, wszINPUT))
-            HTMLInputElement_Create(ret);
-        else if(!strcmpW(class_name, wszSELECT))
+        if(!strcmpW(class_name, wszSELECT))
             HTMLSelectElement_Create(ret);
         else if(!strcmpW(class_name, wszTEXTAREA))
             HTMLTextAreaElement_Create(ret);
diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c
index a5b7510..7cef2bd 100644
--- a/dlls/mshtml/htmlinput.c
+++ b/dlls/mshtml/htmlinput.c
@@ -36,9 +36,10 @@
 WINE_DEFAULT_DEBUG_CHANNEL(mshtml);

typedef struct {
+    HTMLElement element;
+
     const IHTMLInputElementVtbl *lpHTMLInputElementVtbl;

-    HTMLElement *element;
     nsIDOMHTMLInputElement *nsinput;
 } HTMLInputElement;

@@ -70,7 +71,7 @@ static HRESULT WINAPI HTMLInputElement_QueryInterface(IHTMLInputElement *iface,
         return S_OK;
     }

-    hres = HTMLElement_QI(This->element, riid, ppv);
+    hres = HTMLElement_QI(&This->element, riid, ppv);
     if(FAILED(hres))
         WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv);

@@ -83,7 +84,7 @@ static ULONG WINAPI HTMLInputElement_AddRef(IHTMLInputElement *iface)

TRACE("(%p)\n", This);

-    return IHTMLDocument2_AddRef(HTMLDOC(This->element->node.doc));
+    return IHTMLDocument2_AddRef(HTMLDOC(This->element.node.doc));
 }

static ULONG WINAPI HTMLInputElement_Release(IHTMLInputElement *iface)
@@ -92,7 +93,7 @@ static ULONG WINAPI HTMLInputElement_Release(IHTMLInputElement *iface)

TRACE("(%p)\n", This);

-    return IHTMLDocument2_Release(HTMLDOC(This->element->node.doc));
+    return IHTMLDocument2_Release(HTMLDOC(This->element.node.doc));
 }

static HRESULT WINAPI HTMLInputElement_GetTypeInfoCount(IHTMLInputElement *iface, UINT *pctinfo)
@@ -737,19 +738,20 @@ static const IHTMLInputElementVtbl HTMLInputElementVtbl = {
     HTMLInputElement_get_start
 };

-void HTMLInputElement_Create(HTMLElement *element)
+HTMLElement *HTMLInputElement_Create(nsIDOMHTMLElement *nselem)
 {
     HTMLInputElement *ret = mshtml_alloc(sizeof(HTMLInputElement));
     nsresult nsres;

ret->lpHTMLInputElementVtbl = &HTMLInputElementVtbl;
-    ret->element = element;

-    nsres = nsIDOMHTMLElement_QueryInterface(element->nselem, &IID_nsIDOMHTMLInputElement,
+    nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLInputElement,
                                              (void**)&ret->nsinput);
     if(NS_FAILED(nsres))
         ERR("Could not get nsIDOMHTMLInputElement interface: %08x\n", nsres);

-    element->impl = (IUnknown*)HTMLINPUT(ret);
-    element->destructor = HTMLInputElement_destructor;
+    ret->element.impl = (IUnknown*)HTMLINPUT(ret);
+    ret->element.destructor = HTMLInputElement_destructor;
+
+    return &ret->element;
 }
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index 250942c..7e8337e 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -418,7 +418,7 @@ void detach_ranges(HTMLDocument*);
 HTMLElement *HTMLElement_Create(nsIDOMNode*);
 HTMLElement *HTMLAnchorElement_Create(nsIDOMHTMLElement*);
 HTMLElement *HTMLBodyElement_Create(nsIDOMHTMLElement*);
-void HTMLInputElement_Create(HTMLElement*);
+HTMLElement *HTMLInputElement_Create(nsIDOMHTMLElement*);
 void HTMLSelectElement_Create(HTMLElement*);
 void HTMLTextAreaElement_Create(HTMLElement*);