system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 11:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

shlwapi: Use the standard WideCharToMultiByte instead of wine_utf8_wcstombs.

Browse source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2016-02-24 12:40:59 +09:00
parent 0301c09d3e
commit 262a41ca4a
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
dlls/shlwapi/url.c
View file

@ -1200,16 +1200,15 @@ HRESULT WINAPI UrlEscapeW(
if ((cur >= 0xd800 && cur <= 0xdfff) && if ((cur >= 0xd800 && cur <= 0xdfff) &&
(src[1] >= 0xdc00 && src[1] <= 0xdfff)) (src[1] >= 0xdc00 && src[1] <= 0xdfff))
{ {
WCHAR sur[2]; len = WideCharToMultiByte( CP_UTF8, WC_ERR_INVALID_CHARS, src, 2,
utf, sizeof(utf), NULL, NULL );
sur[0] = cur; src++;
sur[1] = *++src;
len = wine_utf8_wcstombs(WC_ERR_INVALID_CHARS, sur, 2, utf, sizeof(utf));
} }
else else
len = wine_utf8_wcstombs(WC_ERR_INVALID_CHARS, &cur, 1, utf, sizeof(utf)); len = WideCharToMultiByte( CP_UTF8, WC_ERR_INVALID_CHARS, &cur, 1,
utf, sizeof(utf), NULL, NULL );
if(len < 0) { if (!len) {
utf[0] = 0xef; utf[0] = 0xef;
utf[1] = 0xbf; utf[1] = 0xbf;
utf[2] = 0xbd; utf[2] = 0xbd;