From 797030483e6b090a7c04b130c0f70e2078cb8ee4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Iv=C4=83ncescu?= <gabrielopcode@gmail.com>
Date: Thu, 29 Sep 2022 16:25:51 +0300
Subject: [PATCH] include/mshtml: Move some forward interface declarations to
 match Windows SDK.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently, these forward declarations make widl add IHTMLDocument2's `URL`
symbol before the other, lowercased, `url` symbols to the type library
(from IHTMLMetaElement, IDOMStorageEvent, etc). Since the typelib symbols
are case insensitive, `URL` ends up stored instead of `url`, which doesn't
match native.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
---
 include/mshtml.idl | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/include/mshtml.idl b/include/mshtml.idl
index aa243897405..1abd3e99f77 100644
--- a/include/mshtml.idl
+++ b/include/mshtml.idl
@@ -395,9 +395,7 @@ interface IHTMLDOMConstructor : IDispatch
     [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden]       \
     IDispatch *constructor()
 
-interface IHTMLCaret;
 interface IHTMLComputedStyle;
-interface IHTMLDocument2;
 interface IHTMLDocument7;
 interface IHTMLElement;
 interface IHTMLElement2;
@@ -414,14 +412,6 @@ interface IHTMLWindow5;
 interface IHTMLWindow6;
 interface IHTMLWindow7;
 interface IDOMEvent;
-interface IDisplayPointer;
-interface IDisplayServices;
-interface ILineInfo;
-interface IMarkupPointer;
-interface IMarkupContainer;
-interface ISegmentList;
-interface IHTMLChangeLog;
-interface IHTMLChangeSink;
 interface ISVGSVGElement;
 interface IHTMLDOMRange;
 interface IHTMLStyleSheet;
@@ -19574,6 +19564,8 @@ interface IHTMLFramesCollection2 : IDispatch
     HRESULT length([retval, out] LONG *p);
 }
 
+interface IHTMLDocument2;
+
 /*****************************************************************************
  *    IHTMLScreen interface
  */
@@ -28841,6 +28833,16 @@ interface IHTMLComputedStyle : IUnknown
     HRESULT IsEqual([in] IHTMLComputedStyle *pComputedStyle,[out] VARIANT_BOOL *pfEqual);
 };
 
+interface IHTMLCaret;
+interface IDisplayPointer;
+interface IDisplayServices;
+interface ILineInfo;
+interface IMarkupPointer;
+interface IMarkupContainer;
+interface ISegmentList;
+interface IHTMLChangeLog;
+interface IHTMLChangeSink;
+
 /*****************************************************************************
  *    IDisplayPointer interface
  */