From 1dbf3ff76f30fbcb83197df43ed51c112c358b30 Mon Sep 17 00:00:00 2001
From: Jason Simmons <jason-simmons@users.noreply.github.com>
Date: Thu, 20 Oct 2022 17:28:20 -0700
Subject: [PATCH] Convert the executable directory path to UTF-8 on Windows
 (#36908)

---
 fml/platform/win/paths_win.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fml/platform/win/paths_win.cc b/fml/platform/win/paths_win.cc
index f9226354ce5ca..01b5d9a5a7893 100644
--- a/fml/platform/win/paths_win.cc
+++ b/fml/platform/win/paths_win.cc
@@ -9,6 +9,7 @@
 #include <algorithm>
 
 #include "flutter/fml/paths.h"
+#include "flutter/fml/platform/win/wstring_conversion.h"
 
 namespace fml {
 namespace paths {
@@ -58,12 +59,12 @@ std::pair<bool, std::string> GetExecutablePath() {
   if (module == NULL) {
     return {false, ""};
   }
-  char path[MAX_PATH];
-  DWORD read_size = GetModuleFileNameA(module, path, MAX_PATH);
+  wchar_t path[MAX_PATH];
+  DWORD read_size = GetModuleFileNameW(module, path, MAX_PATH);
   if (read_size == 0 || read_size == MAX_PATH) {
     return {false, ""};
   }
-  return {true, std::string{path, read_size}};
+  return {true, WideStringToUtf8({path, read_size})};
 }
 
 std::string AbsolutePath(const std::string& path) {