[Windows] Move to Visual Studio 2019 (#36538)
diff --git a/DEPS b/DEPS
index 41567cd..0d17f83 100644
--- a/DEPS
+++ b/DEPS
@@ -109,7 +109,7 @@
]
deps = {
- 'src': 'https://github.com/flutter/buildroot.git' + '@' + '64d07cbd3d9fa0c15f06c8e24c3bdbf5a9a06329',
+ 'src': 'https://github.com/flutter/buildroot.git' + '@' + '24bd842dde44696462562fb02f9e2226f9297d92',
# Fuchsia compatibility
#
diff --git a/shell/platform/windows/window_proc_delegate_manager_unittests.cc b/shell/platform/windows/window_proc_delegate_manager_unittests.cc
index 9177638..195fb5b 100644
--- a/shell/platform/windows/window_proc_delegate_manager_unittests.cc
+++ b/shell/platform/windows/window_proc_delegate_manager_unittests.cc
@@ -10,11 +10,18 @@
namespace {
+#ifdef _WIN32
+#define FLUTTER_NOINLINE __declspec(noinline)
+#else
+#define FLUTTER_NOINLINE __attribute__((noinline))
+#endif
+
using TestWindowProcDelegate = std::function<std::optional<
LRESULT>(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam)>;
// A FlutterDesktopWindowProcCallback that forwards to a std::function provided
// as user_data.
+FLUTTER_NOINLINE
bool TestWindowProcCallback(HWND hwnd,
UINT message,
WPARAM wparam,
diff --git a/tools/dia_dll.py b/tools/dia_dll.py
index 8d367ca..4c0d45f 100644
--- a/tools/dia_dll.py
+++ b/tools/dia_dll.py
@@ -44,7 +44,7 @@
msvs_version = vs_toolchain.GetVisualStudioVersion()
if bool(int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '1'))):
- dia_path = os.path.join(win_sdk_dir, '..', 'DIA SDK', 'bin', 'amd64')
+ dia_path = os.path.join(win_sdk_dir, '..', '..', 'DIA SDK', 'bin', 'amd64')
else:
if 'GYP_MSVS_OVERRIDE_PATH' in os.environ:
vs_path = os.environ['GYP_MSVS_OVERRIDE_PATH']
