Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
b5561c8b
Commit
b5561c8b
authored
Mar 23, 2022
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Support UTF-8 codepage in RtlInitCodePageTable().
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
8ccb24b1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
0 deletions
+32
-0
locale.c
dlls/kernel32/tests/locale.c
+25
-0
locale.c
dlls/ntdll/locale.c
+7
-0
No files found.
dlls/kernel32/tests/locale.c
View file @
b5561c8b
...
...
@@ -4212,6 +4212,31 @@ static void test_GetCPInfo(void)
ret
=
UnmapViewOfFile
(
ptr
);
ok
(
ret
,
"UnmapViewOfFile failed err %lu
\n
"
,
GetLastError
()
);
status
=
pNtGetNlsSectionPtr
(
11
,
65001
,
NULL
,
&
ptr
,
&
size
);
ok
(
status
==
STATUS_OBJECT_NAME_NOT_FOUND
,
"failed %lx
\n
"
,
status
);
if
(
pRtlInitCodePageTable
)
{
static
USHORT
utf8
[
20
]
=
{
0
,
CP_UTF8
};
memset
(
&
table
,
0xcc
,
sizeof
(
table
)
);
pRtlInitCodePageTable
(
utf8
,
&
table
);
ok
(
table
.
CodePage
==
CP_UTF8
,
"wrong codepage %u
\n
"
,
table
.
CodePage
);
if
(
table
.
MaximumCharacterSize
)
{
ok
(
table
.
MaximumCharacterSize
==
4
,
"wrong char size %u
\n
"
,
table
.
MaximumCharacterSize
);
ok
(
table
.
DefaultChar
==
'?'
,
"wrong default char %x
\n
"
,
table
.
DefaultChar
);
ok
(
table
.
UniDefaultChar
==
0xfffd
,
"wrong default char %x
\n
"
,
table
.
UniDefaultChar
);
ok
(
table
.
TransDefaultChar
==
'?'
,
"wrong default char %x
\n
"
,
table
.
TransDefaultChar
);
ok
(
table
.
TransUniDefaultChar
==
'?'
,
"wrong default char %x
\n
"
,
table
.
TransUniDefaultChar
);
ok
(
!
table
.
DBCSCodePage
,
"wrong dbcs %u
\n
"
,
table
.
DBCSCodePage
);
ok
(
!
table
.
MultiByteTable
,
"wrong mbtable %p
\n
"
,
table
.
MultiByteTable
);
ok
(
!
table
.
WideCharTable
,
"wrong wctable %p
\n
"
,
table
.
WideCharTable
);
ok
(
!
table
.
DBCSRanges
,
"wrong ranges %p
\n
"
,
table
.
DBCSRanges
);
ok
(
!
table
.
DBCSOffsets
,
"wrong offsets %p
\n
"
,
table
.
DBCSOffsets
);
}
else
win_skip
(
"utf-8 codepage not supported
\n
"
);
}
/* normalization tables */
for
(
i
=
0
;
i
<
100
;
i
++
)
...
...
dlls/ntdll/locale.c
View file @
b5561c8b
...
...
@@ -745,6 +745,13 @@ void WINAPI RtlInitCodePageTable( USHORT *ptr, CPTABLEINFO *info )
{
USHORT
hdr_size
=
ptr
[
0
];
if
(
ptr
[
1
]
==
CP_UTF8
)
{
static
const
CPTABLEINFO
utf8_cpinfo
=
{
CP_UTF8
,
4
,
'?'
,
0xfffd
,
'?'
,
'?'
};
*
info
=
utf8_cpinfo
;
return
;
}
info
->
CodePage
=
ptr
[
1
];
info
->
MaximumCharacterSize
=
ptr
[
2
];
info
->
DefaultChar
=
ptr
[
3
];
...
...
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