From 701b31e26c3b3dfb6c140cbc0d48c6d39bf1f552 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 11 Dec 2022 17:07:46 -0600 Subject: Use ConsoleWriteW in netcoresearch.exe. --- src/libs/dutil/WixToolset.DUtil/conutil.cpp | 10 +++++----- src/libs/dutil/WixToolset.DUtil/inc/conutil.h | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'src/libs') diff --git a/src/libs/dutil/WixToolset.DUtil/conutil.cpp b/src/libs/dutil/WixToolset.DUtil/conutil.cpp index 2aec36e5..059af0e0 100644 --- a/src/libs/dutil/WixToolset.DUtil/conutil.cpp +++ b/src/libs/dutil/WixToolset.DUtil/conutil.cpp @@ -30,13 +30,13 @@ static CONSOLE_SCREEN_BUFFER_INFO vcsbiInfo; static HRESULT DAPI ReadInteractiveStdIn( __deref_out_z LPWSTR* ppwzBuffer -); + ); static HRESULT ReadRedirectedStdIn( __deref_out_ecount_opt(*pcchSize) LPWSTR* ppwzBuffer, __out DWORD* pcchSize, BOOL fReadLine, DWORD dwMaxRead -); + ); extern "C" HRESULT DAPI ConsoleInitialize() @@ -207,7 +207,7 @@ LExit: extern "C" HRESULT DAPI ConsoleWriteW( __in CONSOLE_COLOR cc, __in_z LPCWSTR wzData -) + ) { AssertSz(INVALID_HANDLE_VALUE != vhStdOut, "ConsoleInitialize() has not been called"); HRESULT hr = S_OK; @@ -616,7 +616,7 @@ LExit: static HRESULT DAPI ReadInteractiveStdIn( __deref_out_z LPWSTR* ppwzBuffer -) + ) { HRESULT hr = S_OK; LPWSTR pwz = NULL; @@ -678,7 +678,7 @@ static HRESULT ReadRedirectedStdIn( __out DWORD* pcchSize, BOOL fReadLine, DWORD dwMaxRead -) + ) { HRESULT hr = S_OK; LPSTR psz = NULL; diff --git a/src/libs/dutil/WixToolset.DUtil/inc/conutil.h b/src/libs/dutil/WixToolset.DUtil/inc/conutil.h index 92e7f600..84038d1f 100644 --- a/src/libs/dutil/WixToolset.DUtil/inc/conutil.h +++ b/src/libs/dutil/WixToolset.DUtil/inc/conutil.h @@ -25,6 +25,10 @@ typedef enum CONSOLE_COLOR { CONSOLE_COLOR_NORMAL, CONSOLE_COLOR_RED, CONSOLE_CO // structs // functions +/******************************************************************** + ConsoleInitialize - initialize console for UTF-8 + +*********************************************************************/ HRESULT DAPI ConsoleInitialize(); void DAPI ConsoleUninitialize(); -- cgit v1.2.3-55-g6feb