Pier Angelo Vendrame pushed to branch tor-browser-146.0a1-16.0-2 at The Tor Project / Applications / Tor Browser
Commits:
-
54d4d5c6
by june wilde at 2025-12-11T12:11:56+01:00
-
186f0f1a
by june wilde at 2025-12-11T12:12:04+01:00
-
9596a569
by june wilde at 2025-12-11T12:12:05+01:00
6 changed files:
- build/moz.configure/windows.configure
- dom/media/webrtc/libwebrtc_overrides/modules/desktop_capture/desktop_capture_types.h
- third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_session.cc
- third_party/libwebrtc/modules/desktop_capture/win/window_capture_utils.h
- third_party/libwebrtc/rtc_base/cpu_info.cc
- third_party/libwebrtc/rtc_base/win/create_direct3d_device.h
Changes:
| ... | ... | @@ -624,12 +624,13 @@ with only_when(depends(c_compiler)(lambda c: c.type == "clang-cl")): |
| 624 | 624 | add_linker_flag("-LARGEADDRESSAWARE")
|
| 625 | 625 | add_linker_flag("-SAFESEH")
|
| 626 | 626 | |
| 627 | - # avoid conficts with std::min/max
|
|
| 628 | - set_define("NOMINMAX", True)
|
|
| 629 | - |
|
| 630 | 627 | |
| 631 | 628 | set_define("WIN32_LEAN_AND_MEAN", True)
|
| 632 | 629 | |
| 630 | +with only_when(depends(c_compiler)(lambda c: c.type == "clang-cl")):
|
|
| 631 | + # See http://support.microsoft.com/kb/143208 to use STL
|
|
| 632 | + set_define("NOMINMAX", True)
|
|
| 633 | + |
|
| 633 | 634 | |
| 634 | 635 | with only_when(target_is_windows & depends(c_compiler)(lambda c: c.type != "clang-cl")):
|
| 635 | 636 | # strsafe.h on mingw uses macros for function deprecation that pollutes namespace
|
| ... | ... | @@ -7,11 +7,11 @@ |
| 7 | 7 | #ifndef DOM_MEDIA_WEBRTC_LIBWEBRTCOVERRIDES_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_TYPES_H_
|
| 8 | 8 | #define DOM_MEDIA_WEBRTC_LIBWEBRTCOVERRIDES_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_TYPES_H_
|
| 9 | 9 | |
| 10 | -// pid_t
|
|
| 11 | -#if !defined(XP_WIN) || defined(__MINGW32__)
|
|
| 10 | +#if defined(XP_WIN) && \
|
|
| 11 | + !defined(__MINGW32__) // Moving this into the global namespace
|
|
| 12 | +typedef int pid_t; // matching what used to be in
|
|
| 13 | +#elif defined(XP_WIN) // video_capture_defines.h
|
|
| 12 | 14 | # include <sys/types.h>
|
| 13 | -#else
|
|
| 14 | -typedef int pid_t;
|
|
| 15 | 15 | #endif
|
| 16 | 16 | |
| 17 | 17 | #include "../../third_party/libwebrtc/modules/desktop_capture/desktop_capture_types.h"
|
| ... | ... | @@ -13,6 +13,8 @@ |
| 13 | 13 | #include <dispatcherqueue.h>
|
| 14 | 14 | #include <windows.graphics.capture.interop.h>
|
| 15 | 15 | #include <windows.graphics.directx.direct3d11.interop.h>
|
| 16 | +#include <windows.graphics.h>
|
|
| 17 | +#include <wrl/client.h>
|
|
| 16 | 18 | #include <wrl/event.h>
|
| 17 | 19 | |
| 18 | 20 | #include <algorithm>
|
| ... | ... | @@ -11,7 +11,7 @@ |
| 11 | 11 | #ifndef MODULES_DESKTOP_CAPTURE_WIN_WINDOW_CAPTURE_UTILS_H_
|
| 12 | 12 | #define MODULES_DESKTOP_CAPTURE_WIN_WINDOW_CAPTURE_UTILS_H_
|
| 13 | 13 | |
| 14 | -#include <shlobj_core.h>
|
|
| 14 | +#include <shlobj.h>
|
|
| 15 | 15 | #include <windows.h>
|
| 16 | 16 | #include <wrl/client.h>
|
| 17 | 17 |
| ... | ... | @@ -97,7 +97,7 @@ uint64_t xgetbv(uint32_t xcr) { |
| 97 | 97 | }
|
| 98 | 98 | #endif // WEBRTC_ENABLE_AVX2
|
| 99 | 99 | |
| 100 | -#ifndef _MSC_VER
|
|
| 100 | +#if !defined(_MSC_VER) && !defined(__MINGW32__)
|
|
| 101 | 101 | // Intrinsic for "cpuid".
|
| 102 | 102 | #if defined(__pic__) && defined(__i386__)
|
| 103 | 103 | static inline void __cpuid(int cpu_info[4], int info_type) {
|
| ... | ... | @@ -12,9 +12,8 @@ |
| 12 | 12 | #define RTC_BASE_WIN_CREATE_DIRECT3D_DEVICE_H_
|
| 13 | 13 | |
| 14 | 14 | #include <windows.graphics.directx.direct3d11.h>
|
| 15 | -#ifndef __MINGW32__
|
|
| 16 | -# include <windows.graphics.directX.direct3d11.interop.h>
|
|
| 17 | -#else
|
|
| 15 | +#include <windows.graphics.directx.direct3d11.interop.h>
|
|
| 16 | +#ifdef __MINGW32__
|
|
| 18 | 17 | # include <dxgi.h>
|
| 19 | 18 | # include <inspectable.h>
|
| 20 | 19 | extern "C" {
|
| ... | ... | @@ -23,6 +22,7 @@ HRESULT __stdcall CreateDirect3D11DeviceFromDXGIDevice( |
| 23 | 22 | ::IDXGIDevice* dxgiDevice, ::IInspectable** graphicsDevice);
|
| 24 | 23 | }
|
| 25 | 24 | #endif
|
| 25 | + |
|
| 26 | 26 | #include <winerror.h>
|
| 27 | 27 | #include <wrl/client.h>
|
| 28 | 28 |