1536308 - MinGW can't find #include <DispatcherQueue.h>

Status: RESOLVED FIXED

(Firefox Build System :: Toolchains, defect, P1)

Description

[Kelsey Gilbert [:jgilbert]]

Try run:
https://treeherder.mozilla.org/#/jobs?repo=try&revision=758b5c1d9a97e18abea72dede5be8b30730b004b

/builds/worker/workspace/build/src/gfx/angle/checkout/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.h:15:10: fatal error: 'DispatcherQueue.h' file not found

We're likely just missing a Win10 SDK.

Comment 1

[Kelsey Gilbert [:jgilbert]]

We need this fixed sooner rather than later, because it blocks our ANGLE update.

Comment 2

[Jacek Caban]

mingw-w64 is indeed missing dispatcherqueue.h. I sent a patch to upstream. I didn't try it with ANGLE yet, but it's likely that it won't be enough. Most of its dependent windows.system.idl is missing and those areas are tricky because widl support for winrt-like is limited.

Also, since mingw builds are done on case sensitive OS, ANGLE will need to use lower case dispatcherqueue.h instead. If there are more problems, I can't promise a quick fix, so temporarily disabling mingw builds might be the option.

Comment 3

[Kelsey Gilbert [:jgilbert]]

I can get any case-sensitivity issues fixed.

Comment 4

[Jacek Caban]

I managed to get it building:
https://treeherder.mozilla.org/#/jobs?repo=try&revision=f10fe1f4675259cfb2efd03c405f0447726443cb

Required ANGLE changes are not too bad, just case sensitivity fixes. It should probably just go to upstream ANGLE:
https://hg.mozilla.org/try/rev/2fdda9b10532f6def929e9b467e52963c39d7857

On top of recent mingw-w64:
https://hg.mozilla.org/try/rev/348ac20c4d9d
it required quite a few hacks to widl to be able to generate new headers. Here is a patch that just adds those generated headers to mingw-w64 checkout:
https://hg.mozilla.org/try/rev/f8947128b170ec09eecf0bb98d51d4f280adac55
I will look at getting widl and new headers upstreamed, but it will take a while. We may need to use the hack for the time being.

Comment 5

[Kelsey Gilbert [:jgilbert]]

I'm upstreaming the ANGLE fixes:
https://chromium-review.googlesource.com/c/angle/angle/+/1544749

Comment 6

[Kelsey Gilbert [:jgilbert]]

(In reply to Jacek Caban from comment #4)

On top of recent mingw-w64:
https://hg.mozilla.org/try/rev/348ac20c4d9d
it required quite a few hacks to widl to be able to generate new headers. Here is a patch that just adds those generated headers to mingw-w64 checkout:
https://hg.mozilla.org/try/rev/f8947128b170ec09eecf0bb98d51d4f280adac55
I will look at getting widl and new headers upstreamed, but it will take a while. We may need to use the hack for the time being.

Can we land this for the time being in Firefox, and file a follow-up bug to remove the hack when we can?

Comment 7

[Tom Ritter [:tjr] (OOTO until 4/30 at least)]

Yes, I will do so. (Just have to get Phab set up.)

Comment 8

[Tom Ritter [:tjr] (OOTO until 4/30 at least)]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=2ff9e9811b8e3b43c387e1834c9dab147db152e2

Comment 9

[Tom Ritter [:tjr] (OOTO until 4/30 at least)]

Attachment: Bug 1536308 - Apply a local patch to MinGW to get the needed winrt stuff for ANGLE r?#build

We apply a local patch while we wait for upstream wine and mingw to review
the changes to widlt hat are necessary to generate the correct headers. Here we
just grab the generated headers and patch them into MinGW

We can revert this when MinGW updates, but for now we would like to unblock
the ANGLE update

Depends on D25294

Comment 10

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/08a3525d99d2
Apply a local patch to MinGW to get the needed winrt stuff for ANGLE r=froydnj

Comment 11

[Narcis Beleuzu [:NarcisB]]

https://hg.mozilla.org/mozilla-central/rev/08a3525d99d2

Comment 12

[Kelsey Gilbert [:jgilbert]]

FYI the DispatcherQueue.h and VersionHelpers.h were already the correct case, so I've reverted that part of the ANGLE patch.

Comment 13

[Jacek Caban]

It was intentional, that's what all mingw headers use. On Windows SDK it doesn't really matter. I commented in ANGLE review.

Comment 14

[Kelsey Gilbert [:jgilbert]]

Please comment here:
https://bugs.chromium.org/p/angleproject/issues/detail?id=3336

Comment 15

[Georg Koppen]

(In reply to Tom Ritter [:tjr] (ni for response to sec-[approval|rating|advisories|cve]) from comment #7)

Yes, I will do so. (Just have to get Phab set up.)

Do you actually file the follow-up somewhere, too? While it seems Jacek changes have not landed yet, we probably should make sure the patch removal is not falling through the cracks.

Comment 16

[Tom Ritter [:tjr] (OOTO until 4/30 at least)]

I just filed Bug 1649484. We've accumulated a few mingw-fixes-needed bugs under mingw-clang lately, and it's possible a few more have slipped through the cracks...