Use ConsoleWriteW in netcoresearch.exe.
Sean Hall committed
Dec 11, 2022 at 17:07 UTC
701b31e26c3b3dfb6c140cbc0d48c6d39bf1f552
3 files changed
+10
-13
src/ext/NetFx/netcoresearch/netcoresearch.cpp
+1
-8
@@ -24,9 +24,6 @@ int __cdecl wmain(int argc, LPWSTR argv[])
24
HRESULT hr = S_OK;
25
DWORD dwMajorVersion = 0;
26
VERUTIL_VERSION* pVersion = NULL;
27
- LPSTR pszVersion = NULL;
28
-
29
- ::SetConsoleCP(CP_UTF8);
27
28
ConsoleInitialize();
29
@@ -43,14 +40,10 @@ int __cdecl wmain(int argc, LPWSTR argv[])
40
41
if (pVersion)
42
{
46
- hr = StrAnsiAllocString(&pszVersion, pVersion->sczVersion, 0, CP_UTF8);
47
- ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to convert version to UTF-8.");
48
-
49
- ConsoleWrite(CONSOLE_COLOR_NORMAL, "%hs", pszVersion);
43
+ ConsoleWriteW(CONSOLE_COLOR_NORMAL, pVersion->sczVersion);
44
}
45
46
LExit:
53
- ReleaseStr(pszVersion);
47
ReleaseVerutilVersion(pVersion);
48
ConsoleUninitialize();
49
return hr;
src/libs/dutil/WixToolset.DUtil/conutil.cpp
+5
-5
@@ -30,13 +30,13 @@ static CONSOLE_SCREEN_BUFFER_INFO vcsbiInfo;
30
31
static HRESULT DAPI ReadInteractiveStdIn(
32
__deref_out_z LPWSTR* ppwzBuffer
33
-);
33
+ );
34
static HRESULT ReadRedirectedStdIn(
35
__deref_out_ecount_opt(*pcchSize) LPWSTR* ppwzBuffer,
36
__out DWORD* pcchSize,
37
BOOL fReadLine,
38
DWORD dwMaxRead
39
-);
39
+ );
40
41
42
extern "C" HRESULT DAPI ConsoleInitialize()
@@ -207,7 +207,7 @@ LExit:
207
extern "C" HRESULT DAPI ConsoleWriteW(
208
__in CONSOLE_COLOR cc,
209
__in_z LPCWSTR wzData
210
-)
210
+ )
211
{
212
AssertSz(INVALID_HANDLE_VALUE != vhStdOut, "ConsoleInitialize() has not been called");
213
HRESULT hr = S_OK;
@@ -616,7 +616,7 @@ LExit:
616
617
static HRESULT DAPI ReadInteractiveStdIn(
618
__deref_out_z LPWSTR* ppwzBuffer
619
-)
619
+ )
620
{
621
HRESULT hr = S_OK;
622
LPWSTR pwz = NULL;
@@ -678,7 +678,7 @@ static HRESULT ReadRedirectedStdIn(
678
__out DWORD* pcchSize,
679
BOOL fReadLine,
680
DWORD dwMaxRead
681
-)
681
+ )
682
{
683
HRESULT hr = S_OK;
684
LPSTR psz = NULL;
src/libs/dutil/WixToolset.DUtil/inc/conutil.h
+4
@@ -25,6 +25,10 @@ typedef enum CONSOLE_COLOR { CONSOLE_COLOR_NORMAL, CONSOLE_COLOR_RED, CONSOLE_CO
25
// structs
26
27
// functions
28
+/********************************************************************
29
+ ConsoleInitialize - initialize console for UTF-8
30
+
31
+*********************************************************************/
32
HRESULT DAPI ConsoleInitialize();
33
void DAPI ConsoleUninitialize();
34