Update Windows linker settings to be compatible with AppContainer when target==winuwp

Author: clarkezone

shell/platform/embedder/BUILD.gn

@@ -246,6 +246,8 @@ if (enable_unittests) {
 
     defines = [ "FLUTTER_ENGINE_NO_PROTOTYPES" ]
 
+    libs = [ "psapi.lib" ]
+
     deps = [
       ":embedder",
       ":embedder_gpu_configuration",

shell/platform/windows/BUILD.gn

@@ -171,7 +171,7 @@ executable("flutter_windows_unittests") {
   testonly = true
 
   if (target_os == "winuwp") {
-    libs = [ "windowsapp.lib" ]
+    libs = [ "windowsapp.lib", "user32.lib" ]
   }
 
   # Common Windows test sources.

shell/platform/windows/key_event_handler.cc

@@ -122,7 +122,9 @@ KeyEventHandler::KeyEventHandler(flutter::BinaryMessenger* messenger,
               kChannelName,
               &flutter::JsonMessageCodec::GetInstance())),
       send_input_(send_input) {
+#ifndef WINUWP
   assert(send_input != nullptr);
+#endif
 }
 
 KeyEventHandler::~KeyEventHandler() = default;
@@ -190,6 +192,7 @@ void KeyEventHandler::HandleResponse(bool handled,
       std::cerr << "Unable to find event " << id << " in pending events queue.";
       return;
     }
+#ifndef WINUWP
     INPUT input_event;
     input_event.type = INPUT_KEYBOARD;
     input_event.ki = *key_event;
@@ -199,6 +202,7 @@ void KeyEventHandler::HandleResponse(bool handled,
                    "with scancode "
                 << scancode << " (character " << character << ")" << std::endl;
     }
+#endif
   }
 }
 
@@ -225,6 +229,10 @@ bool KeyEventHandler::KeyboardHook(FlutterWindowsView* view,
   event.AddMember(kKeyMapKey, kWindowsKeyMap, allocator);
 #ifndef WINUWP
   event.AddMember(kModifiersKey, GetModsForKeyState(), allocator);
+#else
+  // TODO: Implement modifiers in UWP codepath
+  // TODO: https://github.com/flutter/flutter/issues/70202
+  event.AddMember(kModifiersKey, 0, allocator);
 #endif
 
   switch (action) {

shell/platform/windows/key_event_handler.h

@@ -27,8 +27,13 @@ class KeyEventHandler : public KeyboardHookHandler {
   using SendInputDelegate =
       std::function<UINT(UINT cInputs, LPINPUT pInputs, int cbSize)>;
 
+#ifdef WINUWP
+  explicit KeyEventHandler(flutter::BinaryMessenger* messenger,
+                           SendInputDelegate delegate = nullptr);
+#else
   explicit KeyEventHandler(flutter::BinaryMessenger* messenger,
                            SendInputDelegate delegate = SendInput);
+#endif
 
   virtual ~KeyEventHandler();
 

shell/testing/BUILD.gn

@@ -14,6 +14,8 @@ executable("testing") {
 
   sources = [ "tester_main.cc" ]
 
+  libs = [ "psapi.lib", "user32.lib", "FontSub.lib", "shlwapi.lib"]
+
   deps = [
     "//flutter/assets",
     "//flutter/common",

tools/gn

@@ -105,6 +105,8 @@ def to_gn_args(args):
     gn_args['skia_use_fontconfig'] = args.enable_fontconfig
     gn_args['flutter_use_fontconfig'] = args.enable_fontconfig
     gn_args['flutter_enable_skshaper'] = args.enable_skshaper
+    if args.target_os == 'winuwp':
+      gn_args['skia_enable_winuwp'] = True
     if args.enable_skshaper:
       gn_args['skia_use_icu'] = True
       gn_args['skia_enable_icu_ubrk_safeclone'] = True