Sebastian Lackner : mshtml: Fix prototype of nsIDOMWindowUtils:: SetDisplayPortMarginsForElement.

[Alexandre Julliard]

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

Author: Sebastian Lackner <sebastian at fds-team.de>
Date:   Thu Jan  7 08:41:20 2016 +0100

mshtml: Fix prototype of nsIDOMWindowUtils::SetDisplayPortMarginsForElement.

Also add missing comments for some thiscall functions.

Signed-off-by: Sebastian Lackner <sebastian at fds-team.de>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mshtml/nsiface.idl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl
index ccb2547..1f162d7 100644
--- a/dlls/mshtml/nsiface.idl
+++ b/dlls/mshtml/nsiface.idl
@@ -2961,7 +2961,7 @@ interface nsIDOMWindowUtils : nsISupports
     nsresult SetDisplayPortForElement(float aXPx, float aYPx, float aWidthPx, float aHeightPx,
             nsIDOMElement *aElement, uint32_t aPriority);
     nsresult SetDisplayPortMarginsForElement(float aLeftMargin, float aTopMargin, float aRightMargin, float aBottomMargin,
-            uint32_t aAlignmentX, uint32_t aAlignmentY, nsIDOMElement *aElement, uint32_t aPriority);
+            nsIDOMElement *aElement, uint32_t aPriority);
     nsresult SetDisplayPortBaseForElement(int32_t aX, int32_t aY, int32_t aWidth, int32_t aHeight, nsIDOMElement *aElement);
     nsresult SetResolution(float aResolution);
     nsresult GetResolution(float *aResolution);
@@ -3893,8 +3893,8 @@ interface nsIDocShell : nsIDocShellTreeItem
     nsresult GatherCharsetMenuTelemetry();
     nsresult GetForcedCharset(nsIAtom **aForcedCharset);
     nsresult SetForcedCharset(nsIAtom *aForcedCharset);
-    void SetParentCharset(const nsACString *parentCharset, int32_t parentCharsetSource, nsIPrincipal *parentCharsetPrincipal);
-    void GetParentCharset(nsACString *parentCharset, int32_t *parentCharsetSource, nsIPrincipal **parentCharsetPrincipal);
+    void /* thiscall */ SetParentCharset(const nsACString *parentCharset, int32_t parentCharsetSource, nsIPrincipal *parentCharsetPrincipal);
+    void /* thiscall */ GetParentCharset(nsACString *parentCharset, int32_t *parentCharsetSource, nsIPrincipal **parentCharsetPrincipal);
     nsresult GetRecordProfileTimelineMarkers(bool *aRecordProfileTimelineMarkers);
     nsresult SetRecordProfileTimelineMarkers(bool aRecordProfileTimelineMarkers);
     nsresult Now(int /* DOMHighResTimeStamp */ *_retval);
@@ -3921,7 +3921,7 @@ interface nsIDocShell : nsIDocShellTreeItem
     nsresult SetSandboxFlags(uint32_t aSandboxFlags);
     nsresult GetOnePermittedSandboxedNavigator(nsIDocShell **aOnePermittedSandboxedNavigator);
     nsresult SetOnePermittedSandboxedNavigator(nsIDocShell *aOnePermittedSandboxedNavigator);
-    bool IsSandboxedFrom(nsIDocShell *aTargetDocShell);
+    bool /* thiscall */ IsSandboxedFrom(nsIDocShell *aTargetDocShell);
     nsresult GetMixedContentChannel(nsIChannel **aMixedContentChannel);
     nsresult SetMixedContentChannel(nsIChannel *aMixedContentChannel);
     nsresult GetAllowMixedContentAndConnectionData(bool *rootHasSecureConnection, bool *allowMixedContent, bool *isRootDocShell);