From 262a41ca4a9eb581c94088b94fa8aae118451b68 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 24 Feb 2016 12:40:59 +0900 Subject: [PATCH] shlwapi: Use the standard WideCharToMultiByte instead of wine_utf8_wcstombs. Signed-off-by: Alexandre Julliard --- dlls/shlwapi/url.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 0680a558acf..85fa3c147cc 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -1200,16 +1200,15 @@ HRESULT WINAPI UrlEscapeW( if ((cur >= 0xd800 && cur <= 0xdfff) && (src[1] >= 0xdc00 && src[1] <= 0xdfff)) { - WCHAR sur[2]; - - sur[0] = cur; - sur[1] = *++src; - len = wine_utf8_wcstombs(WC_ERR_INVALID_CHARS, sur, 2, utf, sizeof(utf)); + len = WideCharToMultiByte( CP_UTF8, WC_ERR_INVALID_CHARS, src, 2, + utf, sizeof(utf), NULL, NULL ); + src++; } 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[1] = 0xbf; utf[2] = 0xbd;