Jacek Caban : mshtml: Fixed nsIDOMNSHTMLElement declaration.

Alexandre Julliard julliard at winehq.org
Mon Dec 28 09:16:05 CST 2009


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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Sun Dec 27 02:16:23 2009 +0100

mshtml: Fixed nsIDOMNSHTMLElement declaration.

---

 dlls/mshtml/htmldoc3.c  |    2 +-
 dlls/mshtml/htmlelem2.c |    2 +-
 dlls/mshtml/nsiface.idl |   12 +++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c
index b930d88..de32302 100644
--- a/dlls/mshtml/htmldoc3.c
+++ b/dlls/mshtml/htmldoc3.c
@@ -670,7 +670,7 @@ static HRESULT WINAPI HTMLDocument4_focus(IHTMLDocument4 *iface)
         return E_FAIL;
     }
 
-    nsres = nsIDOMNSHTMLElement_focus(nselem);
+    nsres = nsIDOMNSHTMLElement_Focus(nselem);
     nsIDOMNSHTMLElement_Release(nselem);
     if(NS_FAILED(nsres)) {
         ERR("Focus failed: %08x\n", nsres);
diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c
index 254ebf8..cd9b676 100644
--- a/dlls/mshtml/htmlelem2.c
+++ b/dlls/mshtml/htmlelem2.c
@@ -451,7 +451,7 @@ static HRESULT WINAPI HTMLElement2_focus(IHTMLElement2 *iface)
 
     nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem);
     if(NS_SUCCEEDED(nsres)) {
-        nsIDOMNSHTMLElement_focus(nselem);
+        nsIDOMNSHTMLElement_Focus(nselem);
         nsIDOMNSHTMLElement_Release(nselem);
     }else {
         ERR("Could not get nsIDOMHTMLNSElement: %08x\n", nsres);
diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl
index 68d37fe..4111e12 100644
--- a/dlls/mshtml/nsiface.idl
+++ b/dlls/mshtml/nsiface.idl
@@ -803,8 +803,10 @@ interface nsIDOMNSHTMLElement : nsISupports
     nsresult SetTabIndex(PRInt32 aTabIndex);
     nsresult GetContentEditable(nsAString *aContentEditable);
     nsresult SetContentEditable(const nsAString *aContentEditable);
-    nsresult blur();
-    nsresult focus();
+    nsresult GetDraggable(PRBool *aDraggable);
+    nsresult SetDraggable(PRBool aDraggable);
+    nsresult Blur();
+    nsresult Focus();
     nsresult ScrollIntoView(PRBool top);
     nsresult GetSpellcheck(PRBool *aSpellcheck);
     nsresult SetSpellcheck(PRBool aSpellcheck);
@@ -2222,7 +2224,7 @@ interface nsIDOMMouseEvent : nsIDOMUIEvent
     nsresult GetAltKey(PRBool *aAltKey);
     nsresult GetMetaKey(PRBool *aMetaKey);
     nsresult GetButton(PRUint16 *aButton);
-    nsresult GetRelatedTarget(nsIDOMEventTarget * *aRelatedTarget);
+    nsresult GetRelatedTarget(nsIDOMEventTarget **aRelatedTarget);
     nsresult InitMouseEvent(const nsAString *typeArg, PRBool canBubbleArg, PRBool cancelableArg,
             nsIDOMAbstractView *viewArg, PRInt32 detailArg, PRInt32 screenXArg, PRInt32 screenYArg,
             PRInt32 clientXArg, PRInt32 clientYArg, PRBool ctrlKeyArg, PRBool altKeyArg,
@@ -2350,7 +2352,7 @@ interface nsIProfile : nsISupports
     nsresult GetProfileCount(PRInt32 *aProfileCount);
     nsresult GetProfileList(PRUint32 *length, PRUnichar ***profileNames);
     nsresult ProfileExists(const PRUnichar *profileName, PRBool *_retval);
-    nsresult GetCurrentProfile(PRUnichar * *aCurrentProfile);
+    nsresult GetCurrentProfile(PRUnichar **aCurrentProfile);
     nsresult SetCurrentProfile(const PRUnichar * aCurrentProfile);
     nsresult ShutDownCurrentProfile(PRUint32 shutDownType);
     nsresult CreateNewProfile(const PRUnichar *profileName,
@@ -2756,7 +2758,7 @@ interface nsIDocShell : nsISupports
     nsresult GetSessionStorageForURI(nsIURI *uri, nsIDOMStorage **_retval);
     nsresult GetSessionStorageForPrincipal(nsIPrincipal *principal, PRBool create, nsIDOMStorage **_retval);
     nsresult AddSessionStorage(nsIPrincipal *principal, nsIDOMStorage *storage);
-    nsresult GetCurrentDocumentChannel(nsIChannel * *aCurrentDocumentChannel);
+    nsresult GetCurrentDocumentChannel(nsIChannel **aCurrentDocumentChannel);
     nsresult SetChildOffset(PRUint32 offset);
     nsresult GetIsInUnload(PRBool *aIsInUnload);
     nsresult GetChannelIsUnsafe(PRBool *aChannelIsUnsafe);




More information about the wine-cvs mailing list