diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-12-11 17:07:46 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-12-12 23:09:38 -0600 |
| commit | 701b31e26c3b3dfb6c140cbc0d48c6d39bf1f552 (patch) | |
| tree | c17b5a98a1b3db4e6e6151c1130a816e5779a09d /src/ext/NetFx | |
| parent | eab59ecbfd254bb8707615bc31b840339a6356d6 (diff) | |
| download | wix-701b31e26c3b3dfb6c140cbc0d48c6d39bf1f552.tar.gz wix-701b31e26c3b3dfb6c140cbc0d48c6d39bf1f552.tar.bz2 wix-701b31e26c3b3dfb6c140cbc0d48c6d39bf1f552.zip | |
Use ConsoleWriteW in netcoresearch.exe.
Diffstat (limited to 'src/ext/NetFx')
| -rw-r--r-- | src/ext/NetFx/netcoresearch/netcoresearch.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/ext/NetFx/netcoresearch/netcoresearch.cpp b/src/ext/NetFx/netcoresearch/netcoresearch.cpp index b2dad9a8..517f6ac4 100644 --- a/src/ext/NetFx/netcoresearch/netcoresearch.cpp +++ b/src/ext/NetFx/netcoresearch/netcoresearch.cpp | |||
| @@ -24,9 +24,6 @@ int __cdecl wmain(int argc, LPWSTR argv[]) | |||
| 24 | HRESULT hr = S_OK; | 24 | HRESULT hr = S_OK; |
| 25 | DWORD dwMajorVersion = 0; | 25 | DWORD dwMajorVersion = 0; |
| 26 | VERUTIL_VERSION* pVersion = NULL; | 26 | VERUTIL_VERSION* pVersion = NULL; |
| 27 | LPSTR pszVersion = NULL; | ||
| 28 | |||
| 29 | ::SetConsoleCP(CP_UTF8); | ||
| 30 | 27 | ||
| 31 | ConsoleInitialize(); | 28 | ConsoleInitialize(); |
| 32 | 29 | ||
| @@ -43,14 +40,10 @@ int __cdecl wmain(int argc, LPWSTR argv[]) | |||
| 43 | 40 | ||
| 44 | if (pVersion) | 41 | if (pVersion) |
| 45 | { | 42 | { |
| 46 | hr = StrAnsiAllocString(&pszVersion, pVersion->sczVersion, 0, CP_UTF8); | 43 | ConsoleWriteW(CONSOLE_COLOR_NORMAL, pVersion->sczVersion); |
| 47 | ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to convert version to UTF-8."); | ||
| 48 | |||
| 49 | ConsoleWrite(CONSOLE_COLOR_NORMAL, "%hs", pszVersion); | ||
| 50 | } | 44 | } |
| 51 | 45 | ||
| 52 | LExit: | 46 | LExit: |
| 53 | ReleaseStr(pszVersion); | ||
| 54 | ReleaseVerutilVersion(pVersion); | 47 | ReleaseVerutilVersion(pVersion); |
| 55 | ConsoleUninitialize(); | 48 | ConsoleUninitialize(); |
| 56 | return hr; | 49 | return hr; |
