[PATCH 0/1] MR2509: include: Fix c++ compiler error with msxml2.idl.

[Biswapriyo Nath (＠Biswa96)]

include: Fix c++ compiler error with msxml2.idl

    This moves ISAXXMLFilter declaration after its base class ISAXXMLReader.
    Otherwise the following error is shown in C++ mode

    $ wineg++ test-msxml2.cpp
    In file included from test-msxml2.cpp:1:
    /usr/include/wine/windows/msxml2.h:16199:24: error: invalid use of incomplete type ‘struct ISAXXMLReader’
    16199 | ISAXXMLFilter : public ISAXXMLReader
    |                        ^~~~~~~~~~~~~
    /usr/include/wine/windows/msxml2.h:644:19: note: forward declaration of ‘struct ISAXXMLReader’
    644 | typedef interface ISAXXMLReader ISAXXMLReader;
    |                   ^~~~~~~~~~~~~
    winegcc: /usr/bin/g++ failed

    Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com>

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2509

[PATCH 1/1] include: Fix c++ compiler error with msxml2.idl.

[Biswapriyo Nath]

From: Biswapriyo Nath <nathbappai(a)gmail.com>

This moves ISAXXMLFilter declaration after its base class ISAXXMLReader.
Otherwise the following error is shown in C++ mode

$ wineg++ test-msxml2.cpp
In file included from test-msxml2.cpp:1:
/usr/include/wine/windows/msxml2.h:16199:24: error: invalid use of incomplete type ‘struct ISAXXMLReader’
16199 | ISAXXMLFilter : public ISAXXMLReader
|                        ^~~~~~~~~~~~~
/usr/include/wine/windows/msxml2.h:644:19: note: forward declaration of ‘struct ISAXXMLReader’
644 | typedef interface ISAXXMLReader ISAXXMLReader;
|                   ^~~~~~~~~~~~~
winegcc: /usr/bin/g++ failed

Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com>
---
 include/msxml2.idl | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/include/msxml2.idl b/include/msxml2.idl
index 916e0e8ab3d..ede4113ecbf 100644
--- a/include/msxml2.idl
+++ b/include/msxml2.idl
@@ -2125,20 +2125,7 @@ interface ISAXLocator : IUnknown
 [
     local,
     object,
-    uuid(70409222-ca09-4475-acb8-40312fe8d145)
-]
-interface ISAXXMLFilter : ISAXXMLReader
-{
-    HRESULT getParent(
-        [out, retval] ISAXXMLReader ** pReader);
-    HRESULT putParent(
-        [in] ISAXXMLReader * reader);
-}
-
-[
-local,
-object,
-uuid (a4f96ed0-f829-476e-81c0-cdc7bd2a0802)
+    uuid(a4f96ed0-f829-476e-81c0-cdc7bd2a0802)
 ]
 interface ISAXXMLReader : IUnknown
 {
@@ -2192,6 +2179,19 @@ interface ISAXXMLReader : IUnknown
         [in] const WCHAR * url);
 }
 
+[
+    local,
+    object,
+    uuid(70409222-ca09-4475-acb8-40312fe8d145)
+]
+interface ISAXXMLFilter : ISAXXMLReader
+{
+    HRESULT getParent(
+        [out, retval] ISAXXMLReader ** pReader);
+    HRESULT putParent(
+        [in] ISAXXMLReader * reader);
+}
+
 [
     object,
     dual,
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/2509

[Biswapriyo Nath (＠Biswa96)]

Here is the error message from clang.

```
F:/msys64/clang64/include/msxml2.h:16199:24: error: base class has incomplete type
ISAXXMLFilter : public ISAXXMLReader
                ~~~~~~~^~~~~~~~~~~~~
F:/msys64/clang64/include/msxml2.h:644:19: note: forward declaration of 'ISAXXMLReader'
typedef interface ISAXXMLReader ISAXXMLReader;
                  ^
1 error generated.
```

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2509#note_27941