mirror/libserialport
mirror/libserialport
1
0
Fork 0
mirror of git://sigrok.org/libserialport synced 2023-08-10 21:13:24 +03:00
Code Issues Projects Releases Wiki Activity

windows: wc_to_utf8: Eliminate variable-length array.

Browse Source 
This should enable compatibility with MSVC.
This commit is contained in:
Martin Ling 2019-12-28 22:38:04 +01:00
parent e9d78d82c4
commit a9900f8b64
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
windows.c
View File

@ -31,8 +31,12 @@ static void enumerate_hub(struct sp_port *port, const char *hub_name,
static char *wc_to_utf8(PWCHAR wc_buffer, ULONG size) static char *wc_to_utf8(PWCHAR wc_buffer, ULONG size)
{ {
ULONG wc_length = size / sizeof(WCHAR); ULONG wc_length = size / sizeof(WCHAR);
WCHAR wc_str[wc_length + 1]; WCHAR *wc_str = NULL;
char *utf8_str; char *utf8_str = NULL;
/* Allocate aligned wide char buffer */
if (!(wc_str = malloc(size + sizeof(WCHAR))))
goto wc_to_utf8_end;
/* Zero-terminate the wide char string. */ /* Zero-terminate the wide char string. */
memcpy(wc_str, wc_buffer, size); memcpy(wc_str, wc_buffer, size);
@ -41,19 +45,24 @@ static char *wc_to_utf8(PWCHAR wc_buffer, ULONG size)
/* Compute the size of the UTF-8 converted string. */ /* Compute the size of the UTF-8 converted string. */
if (!(size = WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, wc_str, -1, if (!(size = WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, wc_str, -1,
NULL, 0, NULL, NULL))) NULL, 0, NULL, NULL)))
return NULL; goto wc_to_utf8_end;
/* Allocate UTF-8 output buffer. */ /* Allocate UTF-8 output buffer. */
if (!(utf8_str = malloc(size))) if (!(utf8_str = malloc(size)))
return NULL; goto wc_to_utf8_end;
/* Actually converted to UTF-8. */ /* Actually converted to UTF-8. */
if (!WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, wc_str, -1, if (!WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, wc_str, -1,
utf8_str, size, NULL, NULL)) { utf8_str, size, NULL, NULL)) {
free(utf8_str); free(utf8_str);
return NULL; utf8_str = NULL;
goto wc_to_utf8_end;
} }
wc_to_utf8_end:
if (wc_str)
free(wc_str);
return utf8_str; return utf8_str;
} }