Implement missing Windows headers required for building cross-compiling WebRTC with mingw

added Windows label

changed the description

changed title from Implement missing Windows headers requried for building WebRTC with mingw to Implement missing Windows headers required for building cross-compiling WebRTC with mingw

marked this issue as related to #42750 (closed)

added Uplift Upstream labels

added Next label

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

Hey, that's what we needed! This adds include/windows.graphics.idl, which is the .idl we were missing.

Also, it implements IGraphicsCaptureItem and IDirect3D11CaptureFramePool in include/windows.graphics.capture.idl!

All this stuff has already been included in mingw a couple of weeks ago. We can try to bump mingw to the latest and greatest, and see if it's enough for us.

The final error I had from my initial attempt was windows.graphics.directX.direct3d11.interop.h, which is still missing.

I had already had this problem last year, and I solved it by patching third_party/libwebrtc/rtc_base/win/create_direct3d_device.h. I remember writing this:

#ifndef __MINGW32__
#  include <windows.graphics.directX.direct3d11.interop.h>
#else
#  include <dxgi.h>
#  include <inspectable.h>
extern "C" {
// This function is only used in decltype(..)
HRESULT __stdcall CreateDirect3D11DeviceFromDXGIDevice(
    ::IDXGIDevice* dxgiDevice, ::IInspectable** graphicsDevice);
}
#endif

However, we now have that problem also in third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_session.cc, because it wants Windows::Graphics::DirectX::Direct3D11::IDirect3DDxgiInterfaceAccess (and it calls only to its GetInterface method).

MSDN has the code of this struct, but it seems it can't be legally used for proving wine the .idl file?

Now I'm curious to see if copying and pasting that struct is enough to fix WebRTC .

It more or less is, but some additional magic to define its GUID will be needed:

 0:03.81 ld.lld: error: undefined symbol: _GUID const& __mingw_uuidof<Windows::Graphics::DirectX::Direct3D11::IDirect3DDxgiInterfaceAccess>()
 0:03.81 >>> referenced by /home/piero/tor-browser/third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_session.cc:382

Speaking of GUIDs, I also had to comment out IID_IGraphicsCaptureSession2.

I tried to resolve some build errors because I wanted to check the default browser agent, but eventually I stopped at this link problem (and I couldn't get to the default browser agent).

I used these diffs to get there (we'll likely need some of them, but some others just comment stuff to make the build continue).

My diff (mullvad-browser.git)

diff --git a/third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_session.cc b/third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_session.cc
index 86afc5241196..3030c8d12f03 100644
--- a/third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_session.cc
+++ b/third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_session.cc
@@ -10,12 +10,12 @@
 
 #include "modules/desktop_capture/win/wgc_capture_session.h"
 
-#include <DispatcherQueue.h>
+#include <dispatcherqueue.h>
 #include <windows.graphics.capture.interop.h>
-#include <windows.graphics.directX.direct3d11.interop.h>
+// #include <windows.graphics.directX.direct3d11.interop.h>
 #include <windows.graphics.h>
 #include <wrl/client.h>
-#include <wrl/event.h>
+// #include <wrl/event.h>
 
 #include <algorithm>
 #include <memory>
@@ -34,6 +34,15 @@
 using Microsoft::WRL::ComPtr;
 namespace WGC = ABI::Windows::Graphics::Capture;
 
+namespace Windows { namespace Graphics { namespace DirectX { namespace Direct3D11 {
+struct IDirect3DDxgiInterfaceAccess : IUnknown {
+  HRESULT GetInterface(
+    REFIID iid,
+    void   **p
+  );
+};
+}}}}
+
 namespace webrtc {
 namespace {
 
@@ -126,7 +135,7 @@ HRESULT WgcCaptureSession::StartCapture(const DesktopCaptureOptions& options) {
   // Listen for the Closed event, to detect if the source we are capturing is
   // closed (e.g. application window is closed or monitor is disconnected). If
   // it is, we should abort the capture.
-  item_closed_token_ = std::make_unique<EventRegistrationToken>();
+  /*item_closed_token_ = std::make_unique<EventRegistrationToken>();
   auto closed_handler =
       Microsoft::WRL::Callback<ABI::Windows::Foundation::ITypedEventHandler<
           WGC::GraphicsCaptureItem*, IInspectable*>>(
@@ -136,7 +145,8 @@ HRESULT WgcCaptureSession::StartCapture(const DesktopCaptureOptions& options) {
   if (FAILED(hr)) {
     RecordStartCaptureResult(StartCaptureResult::kAddClosedFailed);
     return hr;
-  }
+  }*/
+  HRESULT hr;
 
   ComPtr<IDXGIDevice> dxgi_device;
   hr = d3d11_device_->QueryInterface(IID_PPV_ARGS(&dxgi_device));
@@ -179,14 +189,14 @@ HRESULT WgcCaptureSession::StartCapture(const DesktopCaptureOptions& options) {
     return hr;
   }
 
-  if (!options.prefer_cursor_embedded()) {
+  /*if (!options.prefer_cursor_embedded()) {
     ComPtr<ABI::Windows::Graphics::Capture::IGraphicsCaptureSession2> session2;
     if (SUCCEEDED(session_->QueryInterface(
             ABI::Windows::Graphics::Capture::IID_IGraphicsCaptureSession2,
             &session2))) {
       session2->put_IsCursorCaptureEnabled(false);
     }
-  }
+  }*/
 
 // Until Mozilla builds with Win 10 SDK v10.0.20348.0 or newer, this
 // code will not build.  Once we support the newer SDK, Bug 1868198
diff --git a/third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.cc b/third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.cc
index 9c545597aa92..c7866df5714d 100644
--- a/third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.cc
+++ b/third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.cc
@@ -10,7 +10,7 @@
 
 #include "modules/desktop_capture/win/wgc_capturer_win.h"
 
-#include <DispatcherQueue.h>
+#include <dispatcherqueue.h>
 #include <windows.foundation.metadata.h>
 #include <windows.graphics.capture.h>
 
diff --git a/third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.h b/third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.h
index 30253d9db62b..64c50e0cf003 100644
--- a/third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.h
+++ b/third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.h
@@ -11,7 +11,7 @@
 #ifndef MODULES_DESKTOP_CAPTURE_WIN_WGC_CAPTURER_WIN_H_
 #define MODULES_DESKTOP_CAPTURE_WIN_WGC_CAPTURER_WIN_H_
 
-#include <DispatcherQueue.h>
+#include <dispatcherqueue.h>
 #include <d3d11.h>
 #include <wrl/client.h>

Mingw patches

I started from mingw-w64 85ca1edc5c95295aa201034da9dc26a10044031f.

--- windows.ui.core.h.orig	2024-07-22 16:15:55.510378102 +0000
+++ windows.ui.core.h	2024-07-22 15:16:23.239404366 +0000
@@ -1602,7 +1602,7 @@ namespace ABI {
             namespace Core {
                 struct CoreProximityEvaluation {
                     INT32 Score;
-                    struct Point AdjustedPoint;
+                    struct Foundation::Point AdjustedPoint;
                 };
             }
         }
@@ -2759,11 +2759,11 @@ namespace ABI {
                         ) = 0;
 
                     virtual HRESULT STDMETHODCALLTYPE GetAsyncKeyState(
-                        enum VirtualKey key,
+                        enum System::VirtualKey key,
                         enum CoreVirtualKeyStates *state) = 0;
 
                     virtual HRESULT STDMETHODCALLTYPE GetKeyState(
-                        enum VirtualKey key,
+                        enum System::VirtualKey key,
                         enum CoreVirtualKeyStates *state) = 0;
 
                     virtual HRESULT STDMETHODCALLTYPE ReleasePointerCapture(
@@ -3491,7 +3491,7 @@ namespace ABI {
                 ICoreWindow2 : public IInspectable
                 {
                     virtual HRESULT STDMETHODCALLTYPE put_PointerPosition(
-                        struct Point value) = 0;
+                        struct Foundation::Point value) = 0;
 
                 };
             }
@@ -4605,7 +4605,7 @@ namespace ABI {
                 IKeyEventArgs : public IInspectable
                 {
                     virtual HRESULT STDMETHODCALLTYPE get_VirtualKey(
-                        enum VirtualKey *value) = 0;
+                        enum System::VirtualKey *value) = 0;
 
                     virtual HRESULT STDMETHODCALLTYPE get_KeyStatus(
                         struct CorePhysicalKeyStatus *value) = 0;
@@ -4876,7 +4876,7 @@ namespace ABI {
                         ABI::Windows::UI::Input::IPointerPoint **value) = 0;
 
                     virtual HRESULT STDMETHODCALLTYPE get_KeyModifiers(
-                        enum VirtualKeyModifiers *value) = 0;
+                        enum System::VirtualKeyModifiers *value) = 0;
 
                     virtual HRESULT STDMETHODCALLTYPE GetIntermediatePoints(
                         ABI::Windows::Foundation::Collections::IVector<ABI::Windows::UI::Input::PointerPoint* > **value) = 0;

--- windows.graphics.capture.h.orig	2024-07-22 16:16:40.349146994 +0000
+++ windows.graphics.capture.h	2024-07-22 15:19:24.698888690 +0000
@@ -902,7 +902,7 @@ namespace ABI {
                 {
                     virtual HRESULT STDMETHODCALLTYPE Recreate(
                         ABI::Windows::Graphics::DirectX::Direct3D11::IDirect3DDevice *device,
-                        enum DirectXPixelFormat pixel_format,
+                        enum DirectX::DirectXPixelFormat pixel_format,
                         INT32 number_of_buffers,
                         struct SizeInt32 size) = 0;
 
@@ -1100,7 +1100,7 @@ namespace ABI {
                 {
                     virtual HRESULT STDMETHODCALLTYPE Create(
                         ABI::Windows::Graphics::DirectX::Direct3D11::IDirect3DDevice *device,
-                        enum DirectXPixelFormat pixel_format,
+                        enum DirectX::DirectXPixelFormat pixel_format,
                         INT32 number_of_buffers,
                         struct SizeInt32 size,
                         ABI::Windows::Graphics::Capture::IDirect3D11CaptureFramePool **result) = 0;
@@ -1236,7 +1236,7 @@ namespace ABI {
                 {
                     virtual HRESULT STDMETHODCALLTYPE CreateFreeThreaded(
                         ABI::Windows::Graphics::DirectX::Direct3D11::IDirect3DDevice *device,
-                        enum DirectXPixelFormat pixel_format,
+                        enum DirectX::DirectXPixelFormat pixel_format,
                         INT32 number_of_buffers,
                         struct SizeInt32 size,
                         ABI::Windows::Graphics::Capture::IDirect3D11CaptureFramePool **result) = 0;