Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
98838aaf
Commit
98838aaf
authored
Apr 28, 2022
by
Eric Pouech
Committed by
Alexandre Julliard
May 02, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
whoami: Use OEM code page for output.
Signed-off-by:
Eric Pouech
<
eric.pouech@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
14bb74cc
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
7 deletions
+5
-7
main.c
programs/whoami/main.c
+5
-7
No files found.
programs/whoami/main.c
View file @
98838aaf
...
@@ -26,24 +26,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(whoami);
...
@@ -26,24 +26,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(whoami);
static
int
output_write
(
const
WCHAR
*
str
,
int
len
)
static
int
output_write
(
const
WCHAR
*
str
,
int
len
)
{
{
DWORD
ret
,
count
;
DWORD
count
;
ret
=
WriteConsoleW
(
GetStdHandle
(
STD_OUTPUT_HANDLE
),
str
,
len
,
&
count
,
NULL
);
if
(
!
WriteConsoleW
(
GetStdHandle
(
STD_OUTPUT_HANDLE
),
str
,
len
,
&
count
,
NULL
))
if
(
!
ret
)
{
{
DWORD
lenA
;
DWORD
lenA
;
char
*
strA
;
char
*
strA
;
/* On Windows WriteConsoleW() fails if the output is redirected. So fall
/* On Windows WriteConsoleW() fails if the output is redirected. So fall
* back to WriteFile(), assuming the console encoding is still the right
* back to WriteFile() with OEM code page.
* one in that case.
*/
*/
lenA
=
WideCharToMultiByte
(
Get
ConsoleOutput
CP
(),
0
,
str
,
len
,
lenA
=
WideCharToMultiByte
(
Get
OEM
CP
(),
0
,
str
,
len
,
NULL
,
0
,
NULL
,
NULL
);
NULL
,
0
,
NULL
,
NULL
);
strA
=
HeapAlloc
(
GetProcessHeap
(),
0
,
lenA
);
strA
=
HeapAlloc
(
GetProcessHeap
(),
0
,
lenA
);
if
(
!
strA
)
if
(
!
strA
)
return
0
;
return
0
;
WideCharToMultiByte
(
Get
ConsoleOutput
CP
(),
0
,
str
,
len
,
strA
,
lenA
,
WideCharToMultiByte
(
Get
OEM
CP
(),
0
,
str
,
len
,
strA
,
lenA
,
NULL
,
NULL
);
NULL
,
NULL
);
WriteFile
(
GetStdHandle
(
STD_OUTPUT_HANDLE
),
strA
,
lenA
,
&
count
,
FALSE
);
WriteFile
(
GetStdHandle
(
STD_OUTPUT_HANDLE
),
strA
,
lenA
,
&
count
,
FALSE
);
HeapFree
(
GetProcessHeap
(),
0
,
strA
);
HeapFree
(
GetProcessHeap
(),
0
,
strA
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment