* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
+ * are also available at https://curl.haxx.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
* KIND, either express or implied.
*
***************************************************************************/
-/***************************************************************************
- * IDN Implementation using windows native APIs
- * Pierre Joye <pierre@php.net>
- ***************************************************************************/
-#if defined(WIN32) && defined(USE_WIN32_IDN)
-#include <windows.h>
-#ifdef HAVE_NORMALIZATION_H
-#define __in
-#define __in_ecount(x)
-#define __out_ecount(x)
-#include <normalization.h>
-#endif
-#include <stdio.h>
-#include <tchar.h>
-#define IDN_MAX_LENGTH 255
-static wchar_t *_curl_win32_UTF8_to_wchar(const char *str_utf8)
-{
- wchar_t *str_w = NULL;
+ /*
+ * IDN conversions using Windows kernel32 and normaliz libraries.
+ */
- if (str_utf8) {
- int str_w_len = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS,
- str_utf8, -1, NULL, 0);
- if (str_w_len) {
- str_w = (wchar_t *) malloc(str_w_len * sizeof(wchar_t));
- if (str_w) {
- if (MultiByteToWideChar(CP_UTF8, 0, str_utf8, -1, str_w,
- str_w_len) == 0) {
- free(str_w);
- str_w = NULL;
- }
- }
- }
- }
+#include "curl_setup.h"
- return str_w;
-}
+#ifdef USE_WIN32_IDN
-static const char *_curl_win32_wchar_to_UTF8(const wchar_t *str_w)
-{
- char *str_utf8 = NULL;
+#include "curl_multibyte.h"
+#include "curl_memory.h"
+#include "warnless.h"
- if (str_w) {
- size_t str_utf8_len = WideCharToMultiByte(CP_UTF8, 0, str_w, -1, NULL,
- 0, NULL, NULL);
- if (str_utf8_len) {
- str_utf8 = (char *) malloc(str_utf8_len * sizeof(wchar_t));
- if (str_utf8) {
- if (WideCharToMultiByte(CP_UTF8, 0, str_w, -1, str_utf8, str_utf8_len,
- NULL, FALSE) == 0) {
- (void) GetLastError();
- free((void *)str_utf8);
- str_utf8 = NULL;
- }
- }
- }
- else {
- (void) GetLastError();
- }
- }
+ /* The last #include file should be: */
+#include "memdebug.h"
- return str_utf8;
-}
+#ifdef WANT_IDN_PROTOTYPES
+# if defined(_SAL_VERSION)
+WINNORMALIZEAPI int WINAPI
+IdnToAscii(_In_ DWORD dwFlags,
+ _In_reads_(cchUnicodeChar) LPCWSTR lpUnicodeCharStr,
+ _In_ int cchUnicodeChar,
+ _Out_writes_opt_(cchASCIIChar) LPWSTR lpASCIICharStr,
+ _In_ int cchASCIIChar);
+WINNORMALIZEAPI int WINAPI
+IdnToUnicode(_In_ DWORD dwFlags,
+ _In_reads_(cchASCIIChar) LPCWSTR lpASCIICharStr,
+ _In_ int cchASCIIChar,
+ _Out_writes_opt_(cchUnicodeChar) LPWSTR lpUnicodeCharStr,
+ _In_ int cchUnicodeChar);
+# else
+WINBASEAPI int WINAPI IdnToAscii(DWORD dwFlags,
+ const WCHAR *lpUnicodeCharStr,
+ int cchUnicodeChar,
+ WCHAR *lpASCIICharStr,
+ int cchASCIIChar);
+WINBASEAPI int WINAPI IdnToUnicode(DWORD dwFlags,
+ const WCHAR *lpASCIICharStr,
+ int cchASCIIChar,
+ WCHAR *lpUnicodeCharStr,
+ int cchUnicodeChar);
+# endif
+#endif
+
+#define IDN_MAX_LENGTH 255
+
+bool curl_win32_idn_to_ascii(const char *in, char **out);
+bool curl_win32_ascii_to_idn(const char *in, char **out);
-int curl_win32_idn_to_ascii(const char *in, char **out)
+bool curl_win32_idn_to_ascii(const char *in, char **out)
{
- wchar_t *in_w = _curl_win32_UTF8_to_wchar(in);
- if (in_w) {
+ bool success = FALSE;
+
+ wchar_t *in_w = Curl_convert_UTF8_to_wchar(in);
+ if(in_w) {
wchar_t punycode[IDN_MAX_LENGTH];
- if (IdnToAscii(0, in_w, -1, punycode, IDN_MAX_LENGTH) == 0) {
- wprintf(L"ERROR %d converting to Punycode\n", GetLastError());
- free(in_w);
- return 0;
- }
+ int chars = IdnToAscii(0, in_w, -1, punycode, IDN_MAX_LENGTH);
free(in_w);
-
- *out = (char *)_curl_win32_wchar_to_UTF8(punycode);
- if (!(*out)) {
- return 0;
+ if(chars) {
+ *out = Curl_convert_wchar_to_UTF8(punycode);
+ if(*out)
+ success = TRUE;
}
}
- return 1;
+
+ return success;
}
-int curl_win32_ascii_to_idn(const char *in, size_t in_len, char **out_utf8)
+bool curl_win32_ascii_to_idn(const char *in, char **out)
{
- if (in) {
- WCHAR unicode[IDN_MAX_LENGTH];
+ bool success = FALSE;
- if (IdnToUnicode(0, (wchar_t *)in, -1, unicode, IDN_MAX_LENGTH) == 0) {
- wprintf(L"ERROR %d converting to Punycode\n", GetLastError());
- return 0;
- }
- else {
- const char *out_utf8 = _curl_win32_wchar_to_UTF8(unicode);
- if (!out_utf8) {
- return 0;
- }
+ wchar_t *in_w = Curl_convert_UTF8_to_wchar(in);
+ if(in_w) {
+ size_t in_len = wcslen(in_w) + 1;
+ wchar_t unicode[IDN_MAX_LENGTH];
+ int chars = IdnToUnicode(0, in_w, curlx_uztosi(in_len),
+ unicode, IDN_MAX_LENGTH);
+ free(in_w);
+ if(chars) {
+ *out = Curl_convert_wchar_to_UTF8(unicode);
+ if(*out)
+ success = TRUE;
}
}
- return 1;
+
+ return success;
}
-#else
-typedef int dummy; /* because ISO C forbids an empty translation unit! */
-#endif
- /* WIN32 */
+
+#endif /* USE_WIN32_IDN */
projects / platform / upstream / curl.git / blobdiff