From fd34f0fd001b9e7516624052221953c499e2e08a Mon Sep 17 00:00:00 2001
From: stuartmorgan <stuartmorgan@google.com>
Date: Wed, 17 Jun 2020 13:35:21 -0700
Subject: [PATCH] Log Windows errors to stderr (#19095)

For error messages in the Windows embedding, use stderr rather than
Windows debug logging, so that it will go to the console where, e.g.,
'flutter run' will display it.
---
 .../platform/windows/angle_surface_manager.cc | 26 +++++++++++--------
 shell/platform/windows/win32_task_runner.cc   |  3 ++-
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/shell/platform/windows/angle_surface_manager.cc b/shell/platform/windows/angle_surface_manager.cc
index c7a07cb5d..df520d376 100644
--- a/shell/platform/windows/angle_surface_manager.cc
+++ b/shell/platform/windows/angle_surface_manager.cc
@@ -4,6 +4,8 @@
 
 #include "flutter/shell/platform/windows/angle_surface_manager.h"
 
+#include <iostream>
+
 namespace flutter {
 
 AngleSurfaceManager::AngleSurfaceManager()
@@ -69,7 +71,7 @@ bool AngleSurfaceManager::Initialize() {
       reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(
           eglGetProcAddress("eglGetPlatformDisplayEXT"));
   if (!eglGetPlatformDisplayEXT) {
-    OutputDebugString(L"EGL: Failed to get a compatible EGLdisplay");
+    std::cerr << "EGL: eglGetPlatformDisplayEXT not available" << std::endl;
     return false;
   }
 
@@ -78,7 +80,7 @@ bool AngleSurfaceManager::Initialize() {
       eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, EGL_DEFAULT_DISPLAY,
                                default_display_attributes);
   if (egl_display_ == EGL_NO_DISPLAY) {
-    OutputDebugString(L"EGL: Failed to get a compatible EGLdisplay");
+    std::cerr << "EGL: Failed to get a compatible EGLdisplay" << std::endl;
     return false;
   }
 
@@ -89,7 +91,8 @@ bool AngleSurfaceManager::Initialize() {
         eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, EGL_DEFAULT_DISPLAY,
                                  fl9_3_display_attributes);
     if (egl_display_ == EGL_NO_DISPLAY) {
-      OutputDebugString(L"EGL: Failed to get a compatible EGLdisplay");
+      std::cerr << "EGL: Failed to get a compatible 9.3 EGLdisplay"
+                << std::endl;
       return false;
     }
 
@@ -100,12 +103,13 @@ bool AngleSurfaceManager::Initialize() {
                                               EGL_DEFAULT_DISPLAY,
                                               warp_display_attributes);
       if (egl_display_ == EGL_NO_DISPLAY) {
-        OutputDebugString(L"EGL: Failed to get a compatible EGLdisplay");
+        std::cerr << "EGL: Failed to get a compatible WARP EGLdisplay"
+                  << std::endl;
         return false;
       }
 
       if (eglInitialize(egl_display_, nullptr, nullptr) == EGL_FALSE) {
-        OutputDebugString(L"EGL: Failed to initialize EGL");
+        std::cerr << "EGL: Failed to initialize EGL" << std::endl;
         return false;
       }
     }
@@ -115,14 +119,14 @@ bool AngleSurfaceManager::Initialize() {
   if ((eglChooseConfig(egl_display_, configAttributes, &egl_config_, 1,
                        &numConfigs) == EGL_FALSE) ||
       (numConfigs == 0)) {
-    OutputDebugString(L"EGL: Failed to choose first context");
+    std::cerr << "EGL: Failed to choose first context" << std::endl;
     return false;
   }
 
   egl_context_ = eglCreateContext(egl_display_, egl_config_, EGL_NO_CONTEXT,
                                   display_context_attributes);
   if (egl_context_ == EGL_NO_CONTEXT) {
-    OutputDebugString(L"EGL: Failed to create EGL context");
+    std::cerr << "EGL: Failed to create EGL context" << std::endl;
     return false;
   }
 
@@ -130,7 +134,7 @@ bool AngleSurfaceManager::Initialize() {
       egl_display_, egl_config_, egl_context_, display_context_attributes);
 
   if (egl_resource_context_ == EGL_NO_CONTEXT) {
-    OutputDebugString(L"EGL: Failed to create EGL resource context");
+    std::cerr << "EGL: Failed to create EGL resource context" << std::endl;
     return false;
   }
 
@@ -145,7 +149,7 @@ void AngleSurfaceManager::CleanUp() {
     egl_context_ = EGL_NO_CONTEXT;
 
     if (result == EGL_FALSE) {
-      OutputDebugString(L"EGL: Failed to destroy context");
+      std::cerr << "EGL: Failed to destroy context" << std::endl;
     }
   }
 
@@ -155,7 +159,7 @@ void AngleSurfaceManager::CleanUp() {
     egl_resource_context_ = EGL_NO_CONTEXT;
 
     if (result == EGL_FALSE) {
-      OutputDebugString(L"EGL: Failed to destroy resource context");
+      std::cerr << "EGL: Failed to destroy resource context" << std::endl;
     }
   }
 
@@ -178,7 +182,7 @@ EGLSurface AngleSurfaceManager::CreateSurface(HWND window) {
                                    static_cast<EGLNativeWindowType>(window),
                                    surfaceAttributes);
   if (surface == EGL_NO_SURFACE) {
-    OutputDebugString(L"Surface creation failed.");
+    std::cerr << "Surface creation failed." << std::endl;
   }
 
   return surface;
diff --git a/shell/platform/windows/win32_task_runner.cc b/shell/platform/windows/win32_task_runner.cc
index e8d66b9fa..6322131fc 100644
--- a/shell/platform/windows/win32_task_runner.cc
+++ b/shell/platform/windows/win32_task_runner.cc
@@ -5,6 +5,7 @@
 #include "flutter/shell/platform/windows/win32_task_runner.h"
 
 #include <atomic>
+#include <iostream>
 #include <utility>
 
 namespace flutter {
@@ -93,7 +94,7 @@ void Win32TaskRunner::PostTask(FlutterTask flutter_task,
   }
 
   if (!PostThreadMessage(main_thread_id_, WM_NULL, 0, 0)) {
-    OutputDebugString(L"Failed to post message to main thread.");
+    std::cerr << "Failed to post message to main thread." << std::endl;
   }
 }
 
-- 
GitLab