[PATCH v2 2/4] kernelbase: Implement URL_UNESCAPE_AS_UTF8 for UrlUnescapeW().

[Jactry Zeng]

From: Jactry Zeng

Signed-off-by: Jactry Zeng 
---
 dlls/kernelbase/path.c | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c
index 7eda9bd483c..71502545ee3 100644
--- a/dlls/kernelbase/path.c
+++ b/dlls/kernelbase/path.c
@@ -2909,9 +2909,11 @@ HRESULT WINAPI UrlUnescapeA(char *url, char *unescaped, DWORD *unescaped_len, DW

HRESULT WINAPI UrlUnescapeW(WCHAR *url, WCHAR *unescaped, DWORD *unescaped_len, DWORD flags)
 {
+    WCHAR *dst, next, utf16_buf[5];
     BOOL stop_unescaping = FALSE;
+    int utf8_len, utf16_len;
     const WCHAR *src;
-    WCHAR *dst, next;
+    char utf8_buf[5];
     DWORD needed;
     HRESULT hr;

@@ -2928,8 +2930,10 @@ HRESULT WINAPI UrlUnescapeW(WCHAR *url, WCHAR *unescaped, DWORD *unescaped_len,
         dst = unescaped;
     }

+    utf8_len = 0;
     for (src = url, needed = 0; *src; src++, needed++)
     {
+        utf16_len = 0;
         if (flags & URL_DONT_UNESCAPE_EXTRA_INFO && (*src == '#' || *src == '?'))
         {
             stop_unescaping = TRUE;
@@ -2939,17 +2943,42 @@ HRESULT WINAPI UrlUnescapeW(WCHAR *url, WCHAR *unescaped, DWORD *unescaped_len,
         {
             INT ih;
             WCHAR buf[5] = L"0x";
+
             memcpy(buf + 2, src + 1, 2*sizeof(WCHAR));
             buf[4] = 0;
             StrToIntExW(buf, STIF_SUPPORT_HEX, &ih);
-            next = (WCHAR) ih;
             src += 2; /* Advance to end of escape */
+
+            if (flags & URL_UNESCAPE_AS_UTF8)
+            {
+                utf8_buf[utf8_len++] = ih;
+                utf16_len = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, utf8_buf, utf8_len, NULL, 0);
+                if (!utf16_len)
+                    continue;
+                else
+                {
+                    MultiByteToWideChar(CP_UTF8, 0, utf8_buf, utf8_len, utf16_buf, utf16_len);
+                    utf16_buf[utf16_len] = 0;
+                    needed += (utf16_len - utf8_len);
+                    utf8_len = 0;
+                }
+            }
+            else
+                next = (WCHAR) ih;
         }
         else
             next = *src;

if (flags & URL_UNESCAPE_INPLACE || needed < *unescaped_len)
-            *dst++ = next;
+        {
+            if (utf16_len)
+            {
+                wcscpy(dst, utf16_buf);
+                dst += utf16_len;
+            }
+            else
+                *dst++ = next;
+        }
     }

if (flags & URL_UNESCAPE_INPLACE || needed < *unescaped_len)