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
92135f66
Commit
92135f66
authored
Apr 28, 2022
by
Eric Pouech
Committed by
Alexandre Julliard
May 02, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fsutil: Use OEM code page for output.
Signed-off-by:
Eric Pouech
<
eric.pouech@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
ebd24cbb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
7 deletions
+5
-7
main.c
programs/fsutil/main.c
+5
-7
No files found.
programs/fsutil/main.c
View file @
92135f66
...
...
@@ -26,23 +26,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(fsutil);
static
void
output_write
(
const
WCHAR
*
str
,
DWORD
wlen
)
{
DWORD
count
,
ret
;
DWORD
count
;
ret
=
WriteConsoleW
(
GetStdHandle
(
STD_OUTPUT_HANDLE
),
str
,
wlen
,
&
count
,
NULL
);
if
(
!
ret
)
if
(
!
WriteConsoleW
(
GetStdHandle
(
STD_OUTPUT_HANDLE
),
str
,
wlen
,
&
count
,
NULL
))
{
DWORD
len
;
char
*
msgA
;
/* On Windows WriteConsoleW() fails if the output is redirected. So fall
* back to WriteFile(), assuming the console encoding is still the right
* one in that case.
* back to WriteFile() with OEM code page.
*/
len
=
WideCharToMultiByte
(
CP_ACP
,
0
,
str
,
wlen
,
NULL
,
0
,
NULL
,
NULL
);
len
=
WideCharToMultiByte
(
GetOEMCP
()
,
0
,
str
,
wlen
,
NULL
,
0
,
NULL
,
NULL
);
msgA
=
HeapAlloc
(
GetProcessHeap
(),
0
,
len
*
sizeof
(
char
));
if
(
!
msgA
)
return
;
WideCharToMultiByte
(
CP_ACP
,
0
,
str
,
wlen
,
msgA
,
len
,
NULL
,
NULL
);
WideCharToMultiByte
(
GetOEMCP
()
,
0
,
str
,
wlen
,
msgA
,
len
,
NULL
,
NULL
);
WriteFile
(
GetStdHandle
(
STD_OUTPUT_HANDLE
),
msgA
,
len
,
&
count
,
FALSE
);
HeapFree
(
GetProcessHeap
(),
0
,
msgA
);
}
...
...
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